Skip to content

Commit 9863284

Browse files
committed
all: Remove outdated ifndef-define-endif header guards
1 parent c234f50 commit 9863284

File tree

108 files changed

+9
-415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+9
-415
lines changed

engine/src/plugins/nop_controller.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222

2323
#pragma once
24-
#ifndef CLOE_CONTROLLER_NOP_HPP_
25-
#define CLOE_CONTROLLER_NOP_HPP_
2624

2725
#include <cloe/controller.hpp> // for DEFINE_CONTROLLER_FACTORY, Json, ...
2826

@@ -42,5 +40,3 @@ DEFINE_CONTROLLER_FACTORY(NopFactory, NopConfiguration, "nop", "stand-in that do
4240

4341
} // namespace controller
4442
} // namespace cloe
45-
46-
#endif // CLOE_CONTROLLER_NOP_HPP_

engine/src/plugins/nop_simulator.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222

2323
#pragma once
24-
#ifndef CLOE_SIMULATOR_NOP_HPP_
25-
#define CLOE_SIMULATOR_NOP_HPP_
2624

2725
#include <memory> // for unique_ptr<>
2826
#include <string> // for string
@@ -53,5 +51,3 @@ DEFINE_SIMULATOR_FACTORY(NopFactory, NopConfiguration, "nop", "stand-in no-opera
5351

5452
} // namespace simulator
5553
} // namespace cloe
56-
57-
#endif // CLOE_SIMULATOR_NOP_HPP_

engine/src/utility/defer.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* \file defer.hpp
2020
*/
2121

22+
#pragma once
23+
2224
#include <functional> // for function<>
2325

2426
namespace engine {

fable/include/fable/conf.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
*/
5050

5151
#pragma once
52-
#ifndef FABLE_CONF_HPP_
53-
#define FABLE_CONF_HPP_
5452

5553
#include <functional> // for function<>
5654
#include <string> // for string
@@ -348,5 +346,3 @@ class Conf {
348346
};
349347

350348
} // namespace fable
351-
352-
#endif // FABLE_CONF_HPP_

fable/include/fable/confable.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_CONFABLE_HPP_
26-
#define FABLE_CONFABLE_HPP_
2725

2826
#include <memory> // for unique_ptr<>
2927

@@ -138,5 +136,3 @@ struct adl_serializer<fable::Confable> {
138136
};
139137

140138
} // namespace nlohmann
141-
142-
#endif // FABLE_CONFABLE_HPP_

fable/include/fable/enum.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222

2323
#pragma once
24-
#ifndef FABLE_ENUM_HPP_
25-
#define FABLE_ENUM_HPP_
2624

2725
#include <map> // for map<>
2826
#include <string> // for string
@@ -172,5 +170,3 @@ T from_string(const std::string& s) {
172170
}
173171

174172
} // namespace fable
175-
176-
#endif // FABLE_ENUM_HPP_

fable/include/fable/environment.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_ENVIRONMENT_HPP_
26-
#define FABLE_ENVIRONMENT_HPP_
2725

2826
#include <cassert> // for assert
2927
#include <map> // for map<>
@@ -134,5 +132,3 @@ inline std::string interpolate_vars(const std::string& s, const Environment* env
134132
}
135133

136134
} // namespace fable
137-
138-
#endif // FABLE_ENVIRONMENT_HPP_

fable/include/fable/error.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
*/
2121

2222
#pragma once
23-
#ifndef FABLE_ERROR_HPP_
24-
#define FABLE_ERROR_HPP_
2523

2624
#include <stdexcept> // for exception
2725
#include <string> // for string
@@ -154,5 +152,3 @@ class SchemaError : public ConfError {
154152
};
155153

156154
} // namespace fable
157-
158-
#endif // FABLE_ERROR_HPP_

fable/include/fable/fable.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525

2626
#pragma once
27-
#ifndef FABLE_FABLE_HPP_
28-
#define FABLE_FABLE_HPP_
2927

3028
#include <fable/conf.hpp>
3129
#include <fable/confable.hpp>
@@ -34,5 +32,3 @@
3432
#include <fable/json.hpp>
3533
#include <fable/json/with_std.hpp>
3634
#include <fable/schema.hpp>
37-
38-
#endif // FABLE_FABLE_HPP_

fable/include/fable/json.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424

2525
#pragma once
26-
#ifndef FABLE_JSON_HPP_
27-
#define FABLE_JSON_HPP_
2826

2927
#include <string> // for string
3028

@@ -108,5 +106,3 @@ inline Json parse_json(InputType&& input) {
108106
}
109107

110108
} // namespace fable
111-
112-
#endif // FABLE_JSON_HPP_

fable/include/fable/json/with_boost.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525

2626
#pragma once
27-
#ifndef FABLE_JSON_WITH_BOOST_HPP_
28-
#define FABLE_JSON_WITH_BOOST_HPP_
2927

3028
#include <nlohmann/json.hpp>
3129

@@ -61,5 +59,3 @@ struct adl_serializer<boost::optional<T>> {
6159
};
6260

6361
} // namespace nlohmann
64-
65-
#endif // FABLE_JSON_WITH_BOOST_HPP_

fable/include/fable/json/with_eigen.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525

2626
#pragma once
27-
#ifndef FABLE_JSON_WITH_EIGEN_HPP_
28-
#define FABLE_JSON_WITH_EIGEN_HPP_
2927

3028
#include <nlohmann/json.hpp>
3129

@@ -87,5 +85,3 @@ struct adl_serializer<Eigen::Isometry3d> {
8785
};
8886

8987
} // namespace nlohmann
90-
91-
#endif // FABLE_JSON_WITH_EIGEN_HPP_

fable/include/fable/json/with_std.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525

2626
#pragma once
27-
#ifndef FABLE_JSON_WITH_STD_HPP_
28-
#define FABLE_JSON_WITH_STD_HPP_
2927

3028
#include <memory> // for unique_ptr<>, shared_ptr<>, weak_ptr<>
3129

@@ -76,5 +74,3 @@ struct adl_serializer<std::weak_ptr<T>> {
7674
};
7775

7876
} // namespace nlohmann
79-
80-
#endif // FABLE_JSON_WITH_STD_HPP_

fable/include/fable/schema.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@
113113
*/
114114

115115
#pragma once
116-
#ifndef FABLE_SCHEMA_HPP_
117-
#define FABLE_SCHEMA_HPP_
118116

119117
#include <chrono> // for duration<>
120118
#include <map> // for map<>
@@ -269,5 +267,3 @@ class Schema : public schema::Interface {
269267
};
270268

271269
} // namespace fable
272-
273-
#endif // FABLE_SCHEMA_HPP_

fable/include/fable/schema/array.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424

2525
#pragma once
26-
#ifndef FABLE_SCHEMA_ARRAY_HPP_
27-
#define FABLE_SCHEMA_ARRAY_HPP_
2826

2927
#include <limits> // for numeric_limits<>
3028
#include <memory> // for shared_ptr<>
@@ -182,5 +180,3 @@ Array<T, P> make_schema(std::vector<T>* ptr, const P& prototype, std::string&& d
182180

183181
} // namespace schema
184182
} // namespace fable
185-
186-
#endif // FABLE_SCHEMA_ARRAY_HPP_

fable/include/fable/schema/boolean.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_BOOLEAN_HPP_
26-
#define FABLE_SCHEMA_BOOLEAN_HPP_
2725

2826
#include <string> // for string
2927
#include <utility> // for move
@@ -57,5 +55,3 @@ inline Boolean make_schema(bool* ptr, std::string&& desc) { return Boolean(ptr,
5755

5856
} // namespace schema
5957
} // namespace fable
60-
61-
#endif // FABLE_SCHEMA_BOOLEAN_HPP_

fable/include/fable/schema/confable.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424

2525
#pragma once
26-
#ifndef FABLE_SCHEMA_CONFABLE_HPP_
27-
#define FABLE_SCHEMA_CONFABLE_HPP_
2826

2927
#include <memory> // for shared_ptr<>
3028
#include <string> // for string
@@ -110,5 +108,3 @@ FromConfable<T> make_schema(T* ptr, std::string&& desc) {
110108

111109
} // namespace schema
112110
} // namespace fable
113-
114-
#endif // FABLE_SCHEMA_CONFABLE_HPP_

fable/include/fable/schema/const.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424

2525
#pragma once
26-
#ifndef FABLE_SCHEMA_CONST_HPP_
27-
#define FABLE_SCHEMA_CONST_HPP_
2826

2927
#include <string> // for string
3028
#include <utility> // for move
@@ -105,5 +103,3 @@ inline Const<std::string, String> make_const_str(const char* constant, std::stri
105103

106104
} // namespace schema
107105
} // namespace fable
108-
109-
#endif // FABLE_SCHEMA_CONST_HPP_

fable/include/fable/schema/custom.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_CUSTOM_HPP_
26-
#define FABLE_SCHEMA_CUSTOM_HPP_
2725

2826
#include <functional> // for function<>
2927

@@ -93,5 +91,3 @@ class CustomDeserializer : public schema::Interface {
9391

9492
} // namespace schema
9593
} // namespace fable
96-
97-
#endif // FABLE_SCHEMA_CUSTOM_HPP_

fable/include/fable/schema/duration.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
*/
2424

2525
#pragma once
26-
#ifndef FABLE_SCHEMA_DURATION_HPP_
27-
#define FABLE_SCHEMA_DURATION_HPP_
2826

2927
#include <chrono> // for duration<>
3028
#include <limits> // for numeric_limits<>
@@ -196,5 +194,3 @@ inline Duration<Rep, Period> make_schema(std::chrono::duration<Rep, Period>* ptr
196194

197195
} // namespace schema
198196
} // namespace fable
199-
200-
#endif // FABLE_SCHEMA_DURATION_HPP_

fable/include/fable/schema/enum.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_ENUM_HPP_
26-
#define FABLE_SCHEMA_ENUM_HPP_
2725

2826
#include <map> // for map<>
2927
#include <string> // for string
@@ -111,5 +109,3 @@ inline Enum<T> make_schema(T* ptr, std::string&& desc) {
111109

112110
} // namespace schema
113111
} // namespace fable
114-
115-
#endif // FABLE_SCHEMA_ENUM_HPP_

fable/include/fable/schema/factory.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222

2323
#pragma once
24-
#ifndef FABLE_SCHEMA_FACTORY_HPP_
25-
#define FABLE_SCHEMA_FACTORY_HPP_
2624

2725
#include <functional> // for function<>
2826
#include <limits> // for numeric_limits<>
@@ -420,5 +418,3 @@ class Factory : public FactoryBase<T, Factory<T>> {
420418

421419
} // namespace schema
422420
} // namespace fable
423-
424-
#endif // FABLE_SCHEMA_FACTORY_HPP_

fable/include/fable/schema/ignore.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_IGNORE_HPP_
26-
#define FABLE_SCHEMA_IGNORE_HPP_
2725

2826
#include <string> // for string
2927
#include <utility> // for move
@@ -68,5 +66,3 @@ inline Ignore make_schema(std::string&& desc, JsonType t = JsonType::object) {
6866

6967
} // namespace schema
7068
} // namespace fable
71-
72-
#endif // FABLE_SCHEMA_IGNORE_HPP_

fable/include/fable/schema/interface.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_INTERFACE_HPP_
26-
#define FABLE_SCHEMA_INTERFACE_HPP_
2725

2826
#include <memory> // for shared_ptr<>
2927
#include <string> // for string
@@ -467,5 +465,3 @@ auto make_prototype(std::string&& desc = "");
467465

468466
} // namespace schema
469467
} // namespace fable
470-
471-
#endif // FABLE_SCHEMA_INTERFACE_HPP_

fable/include/fable/schema/json.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_JSON_HPP_
26-
#define FABLE_SCHEMA_JSON_HPP_
2725

2826
#include <string> // for string
2927
#include <utility> // for move
@@ -88,5 +86,3 @@ inline FromJson<T> make_schema(T* ptr, JsonType t, std::string&& desc) {
8886

8987
} // namespace schema
9088
} // namespace fable
91-
92-
#endif // FABLE_SCHEMA_JSON_HPP_

fable/include/fable/schema/magic.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
*/
3535

3636
#pragma once
37-
#ifndef FABLE_SCHEMA_MAGIC_HPP_
38-
#define FABLE_SCHEMA_MAGIC_HPP_
3937

4038
#include <map> // for map<>
4139
#include <string> // for string
@@ -105,5 +103,3 @@ auto make_prototype(std::string&& desc) {
105103

106104
} // namespace schema
107105
} // namespace fable
108-
109-
#endif // FABLE_SCHEMA_MAGIC_HPP_

fable/include/fable/schema/map.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323

2424
#pragma once
25-
#ifndef FABLE_SCHEMA_MAP_HPP_
26-
#define FABLE_SCHEMA_MAP_HPP_
2725

2826
#include <limits> // for numeric_limits<>
2927
#include <map> // for map<>
@@ -197,5 +195,3 @@ Map<T, P> make_schema(std::map<std::string, T>* ptr, const P& prototype, std::st
197195

198196
} // namespace schema
199197
} // namespace fable
200-
201-
#endif // FABLE_SCHEMA_MAP_HPP_

0 commit comments

Comments
 (0)