Merge pull request #815 from gassmoeller/rename_klass_template

Update classname in macro

Author: MFraters

include/world_builder/coordinate_systems/interface.h

@@ -165,18 +165,18 @@ namespace WorldBuilder
      * register it. Because this is a library, we need some extra measures
      * to ensure that the static variable is actually initialized.
      */
-#define WB_REGISTER_COORDINATE_SYSTEM(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_COORDINATE_SYSTEM(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
   } // namespace CoordinateSystems
 } // namespace WorldBuilder

include/world_builder/features/continental_plate_models/composition/interface.h

@@ -143,18 +143,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_COMPOSITION_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_COMPOSITION_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Composition
     } // namespace ContinentalPlateModels

include/world_builder/features/continental_plate_models/grains/interface.h

@@ -149,18 +149,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_GRAINS_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       virtual std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Grains
     } // namespace ContinentalPlateModels

include/world_builder/features/continental_plate_models/temperature/interface.h

@@ -148,18 +148,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_TEMPERATURE_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Temperature
     } // namespace ContinentalPlateModels

include/world_builder/features/continental_plate_models/velocity/interface.h

@@ -148,18 +148,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_VELOCITY_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_CONTINENTAL_PLATE_VELOCITY_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Velocity
     } // namespace ContinentalPlateModels

include/world_builder/features/fault_models/composition/interface.h

@@ -151,18 +151,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_FAULT_COMPOSITION_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_FAULT_COMPOSITION_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Composition
     } // namespace FaultModels

include/world_builder/features/fault_models/grains/interface.h

@@ -152,18 +152,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_FAULT_GRAINS_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_FAULT_GRAINS_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       virtual std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Grains
     } // namespace FaultModels

include/world_builder/features/fault_models/temperature/interface.h

@@ -152,18 +152,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_FAULT_TEMPERATURE_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_FAULT_TEMPERATURE_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Temperature
     } // namespace FaultModels

include/world_builder/features/fault_models/velocity/interface.h

@@ -151,18 +151,18 @@ namespace WorldBuilder
          * register it. Because this is a library, we need some extra measures
          * to ensure that the static variable is actually initialized.
          */
-#define WB_REGISTER_FEATURE_FAULT_VELOCITY_MODEL(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE_FAULT_VELOCITY_MODEL(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, this); \
+        Interface::registerType(#name, classname::declare_entries, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
       } // namespace Velocity
     } // namespace FaultModels

include/world_builder/features/interface.h

@@ -209,18 +209,18 @@ namespace WorldBuilder
      * register it. Because this is a library, we need some extra measures
      * to ensure that the static variable is actually initialized.
      */
-#define WB_REGISTER_FEATURE(klass,name) \
-  class klass##Factory : public ObjectFactory { \
+#define WB_REGISTER_FEATURE(classname,name) \
+  class classname##Factory : public ObjectFactory { \
     public: \
-      klass##Factory() \
+      classname##Factory() \
       { \
-        Interface::registerType(#name, klass::declare_entries, klass::make_snippet, this); \
+        Interface::registerType(#name, classname::declare_entries, classname::make_snippet, this); \
       } \
       std::unique_ptr<Interface> create(World *world) override final { \
-        return std::unique_ptr<Interface>(new klass(world)); \
+        return std::unique_ptr<Interface>(new classname(world)); \
       } \
   }; \
-  static klass##Factory global_##klass##Factory;
+  static classname##Factory global_##classname##Factory;
 
   } // namespace Features
 } // namespace WorldBuilder