Remove outdated ifndef-define-endif header guards

engine/src/plugins/nop_controller.hpp

@@ -21,8 +21,6 @@
  */
 
 #pragma once
-#ifndef CLOE_CONTROLLER_NOP_HPP_
-#define CLOE_CONTROLLER_NOP_HPP_
 
 #include <cloe/controller.hpp>  // for DEFINE_CONTROLLER_FACTORY, Json, ...
 
@@ -42,5 +40,3 @@ DEFINE_CONTROLLER_FACTORY(NopFactory, NopConfiguration, "nop", "stand-in that do
 
 }  // namespace controller
 }  // namespace cloe
-
-#endif  // CLOE_CONTROLLER_NOP_HPP_

engine/src/plugins/nop_simulator.hpp

@@ -21,8 +21,6 @@
  */
 
 #pragma once
-#ifndef CLOE_SIMULATOR_NOP_HPP_
-#define CLOE_SIMULATOR_NOP_HPP_
 
 #include <memory>  // for unique_ptr<>
 #include <string>  // for string
@@ -53,5 +51,3 @@ DEFINE_SIMULATOR_FACTORY(NopFactory, NopConfiguration, "nop", "stand-in no-opera
 
 }  // namespace simulator
 }  // namespace cloe
-
-#endif  // CLOE_SIMULATOR_NOP_HPP_

engine/src/utility/defer.hpp

@@ -19,6 +19,8 @@
  * \file defer.hpp
  */
 
+#pragma once
+
 #include <functional> // for function<>
 
 namespace engine {

fable/include/fable/conf.hpp

@@ -49,8 +49,6 @@
  */
 
 #pragma once
-#ifndef FABLE_CONF_HPP_
-#define FABLE_CONF_HPP_
 
 #include <functional>  // for function<>
 #include <string>      // for string
@@ -348,5 +346,3 @@ class Conf {
 };
 
 }  // namespace fable
-
-#endif  // FABLE_CONF_HPP_

fable/include/fable/confable.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_CONFABLE_HPP_
-#define FABLE_CONFABLE_HPP_
 
 #include <memory>  // for unique_ptr<>
 
@@ -138,5 +136,3 @@ struct adl_serializer<fable::Confable> {
 };
 
 }  // namespace nlohmann
-
-#endif  // FABLE_CONFABLE_HPP_

fable/include/fable/enum.hpp

@@ -21,8 +21,6 @@
  */
 
 #pragma once
-#ifndef FABLE_ENUM_HPP_
-#define FABLE_ENUM_HPP_
 
 #include <map>          // for map<>
 #include <string>       // for string
@@ -172,5 +170,3 @@ T from_string(const std::string& s) {
 }
 
 }  // namespace fable
-
-#endif  // FABLE_ENUM_HPP_

fable/include/fable/environment.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_ENVIRONMENT_HPP_
-#define FABLE_ENVIRONMENT_HPP_
 
 #include <cassert>  // for assert
 #include <map>      // for map<>
@@ -134,5 +132,3 @@ inline std::string interpolate_vars(const std::string& s, const Environment* env
 }
 
 }  // namespace fable
-
-#endif  // FABLE_ENVIRONMENT_HPP_

fable/include/fable/error.hpp

@@ -20,8 +20,6 @@
  */
 
 #pragma once
-#ifndef FABLE_ERROR_HPP_
-#define FABLE_ERROR_HPP_
 
 #include <stdexcept>  // for exception
 #include <string>     // for string
@@ -154,5 +152,3 @@ class SchemaError : public ConfError {
 };
 
 }  // namespace fable
-
-#endif  // FABLE_ERROR_HPP_

fable/include/fable/fable.hpp

@@ -24,8 +24,6 @@
  */
 
 #pragma once
-#ifndef FABLE_FABLE_HPP_
-#define FABLE_FABLE_HPP_
 
 #include <fable/conf.hpp>
 #include <fable/confable.hpp>
@@ -34,5 +32,3 @@
 #include <fable/json.hpp>
 #include <fable/json/with_std.hpp>
 #include <fable/schema.hpp>
-
-#endif  // FABLE_FABLE_HPP_

fable/include/fable/json.hpp

@@ -23,8 +23,6 @@
  */
 
 #pragma once
-#ifndef FABLE_JSON_HPP_
-#define FABLE_JSON_HPP_
 
 #include <string>  // for string
 
@@ -108,5 +106,3 @@ inline Json parse_json(InputType&& input) {
 }
 
 }  // namespace fable
-
-#endif  // FABLE_JSON_HPP_

fable/include/fable/json/with_boost.hpp

@@ -24,8 +24,6 @@
  */
 
 #pragma once
-#ifndef FABLE_JSON_WITH_BOOST_HPP_
-#define FABLE_JSON_WITH_BOOST_HPP_
 
 #include <nlohmann/json.hpp>
 
@@ -61,5 +59,3 @@ struct adl_serializer<boost::optional<T>> {
 };
 
 }  // namespace nlohmann
-
-#endif  // FABLE_JSON_WITH_BOOST_HPP_

fable/include/fable/json/with_eigen.hpp

@@ -24,8 +24,6 @@
  */
 
 #pragma once
-#ifndef FABLE_JSON_WITH_EIGEN_HPP_
-#define FABLE_JSON_WITH_EIGEN_HPP_
 
 #include <nlohmann/json.hpp>
 
@@ -87,5 +85,3 @@ struct adl_serializer<Eigen::Isometry3d> {
 };
 
 }  // namespace nlohmann
-
-#endif  // FABLE_JSON_WITH_EIGEN_HPP_

fable/include/fable/json/with_std.hpp

@@ -24,8 +24,6 @@
  */
 
 #pragma once
-#ifndef FABLE_JSON_WITH_STD_HPP_
-#define FABLE_JSON_WITH_STD_HPP_
 
 #include <memory>  // for unique_ptr<>, shared_ptr<>, weak_ptr<>
 
@@ -76,5 +74,3 @@ struct adl_serializer<std::weak_ptr<T>> {
 };
 
 }  // namespace nlohmann
-
-#endif  // FABLE_JSON_WITH_STD_HPP_

fable/include/fable/schema.hpp

@@ -113,8 +113,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_HPP_
-#define FABLE_SCHEMA_HPP_
 
 #include <chrono>       // for duration<>
 #include <map>          // for map<>
@@ -269,5 +267,3 @@ class Schema : public schema::Interface {
 };
 
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_HPP_

fable/include/fable/schema/array.hpp

@@ -23,8 +23,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_ARRAY_HPP_
-#define FABLE_SCHEMA_ARRAY_HPP_
 
 #include <limits>       // for numeric_limits<>
 #include <memory>       // for shared_ptr<>
@@ -182,5 +180,3 @@ Array<T, P> make_schema(std::vector<T>* ptr, const P& prototype, std::string&& d
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_ARRAY_HPP_

fable/include/fable/schema/boolean.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_BOOLEAN_HPP_
-#define FABLE_SCHEMA_BOOLEAN_HPP_
 
 #include <string>   // for string
 #include <utility>  // for move
@@ -57,5 +55,3 @@ inline Boolean make_schema(bool* ptr, std::string&& desc) { return Boolean(ptr,
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_BOOLEAN_HPP_

fable/include/fable/schema/confable.hpp

@@ -23,8 +23,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_CONFABLE_HPP_
-#define FABLE_SCHEMA_CONFABLE_HPP_
 
 #include <memory>   // for shared_ptr<>
 #include <string>   // for string
@@ -110,5 +108,3 @@ FromConfable<T> make_schema(T* ptr, std::string&& desc) {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_CONFABLE_HPP_

fable/include/fable/schema/const.hpp

@@ -23,8 +23,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_CONST_HPP_
-#define FABLE_SCHEMA_CONST_HPP_
 
 #include <string>   // for string
 #include <utility>  // for move
@@ -105,5 +103,3 @@ inline Const<std::string, String> make_const_str(const char* constant, std::stri
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_CONST_HPP_

fable/include/fable/schema/custom.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_CUSTOM_HPP_
-#define FABLE_SCHEMA_CUSTOM_HPP_
 
 #include <functional>  // for function<>
 
@@ -93,5 +91,3 @@ class CustomDeserializer : public schema::Interface {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_CUSTOM_HPP_

fable/include/fable/schema/duration.hpp

@@ -23,8 +23,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_DURATION_HPP_
-#define FABLE_SCHEMA_DURATION_HPP_
 
 #include <chrono>   // for duration<>
 #include <limits>   // for numeric_limits<>
@@ -196,5 +194,3 @@ inline Duration<Rep, Period> make_schema(std::chrono::duration<Rep, Period>* ptr
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_DURATION_HPP_

fable/include/fable/schema/enum.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_ENUM_HPP_
-#define FABLE_SCHEMA_ENUM_HPP_
 
 #include <map>          // for map<>
 #include <string>       // for string
@@ -111,5 +109,3 @@ inline Enum<T> make_schema(T* ptr, std::string&& desc) {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_ENUM_HPP_

fable/include/fable/schema/factory.hpp

@@ -21,8 +21,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_FACTORY_HPP_
-#define FABLE_SCHEMA_FACTORY_HPP_
 
 #include <functional>   // for function<>
 #include <limits>       // for numeric_limits<>
@@ -420,5 +418,3 @@ class Factory : public FactoryBase<T, Factory<T>> {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_FACTORY_HPP_

fable/include/fable/schema/ignore.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_IGNORE_HPP_
-#define FABLE_SCHEMA_IGNORE_HPP_
 
 #include <string>   // for string
 #include <utility>  // for move
@@ -68,5 +66,3 @@ inline Ignore make_schema(std::string&& desc, JsonType t = JsonType::object) {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_IGNORE_HPP_

fable/include/fable/schema/interface.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_INTERFACE_HPP_
-#define FABLE_SCHEMA_INTERFACE_HPP_
 
 #include <memory>       // for shared_ptr<>
 #include <string>       // for string
@@ -467,5 +465,3 @@ auto make_prototype(std::string&& desc = "");
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_INTERFACE_HPP_

fable/include/fable/schema/json.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_JSON_HPP_
-#define FABLE_SCHEMA_JSON_HPP_
 
 #include <string>   // for string
 #include <utility>  // for move
@@ -88,5 +86,3 @@ inline FromJson<T> make_schema(T* ptr, JsonType t, std::string&& desc) {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_JSON_HPP_

fable/include/fable/schema/magic.hpp

@@ -34,8 +34,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_MAGIC_HPP_
-#define FABLE_SCHEMA_MAGIC_HPP_
 
 #include <map>      // for map<>
 #include <string>   // for string
@@ -105,5 +103,3 @@ auto make_prototype(std::string&& desc) {
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_MAGIC_HPP_

fable/include/fable/schema/map.hpp

@@ -22,8 +22,6 @@
  */
 
 #pragma once
-#ifndef FABLE_SCHEMA_MAP_HPP_
-#define FABLE_SCHEMA_MAP_HPP_
 
 #include <limits>   // for numeric_limits<>
 #include <map>      // for map<>
@@ -197,5 +195,3 @@ Map<T, P> make_schema(std::map<std::string, T>* ptr, const P& prototype, std::st
 
 }  // namespace schema
 }  // namespace fable
-
-#endif  // FABLE_SCHEMA_MAP_HPP_