Ticktock config macros

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · May 19, 2022 · b572c42 · b572c42
1 parent 66efe46
commit b572c42
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 11 deletions.
diff --git a/core/include/gz/plugin/config.hh.in b/core/include/gz/plugin/config.hh.in
@@ -21,18 +21,13 @@
 #ifndef GZ_PLUGIN_CONFIG_HH_
 
 /* Version number */
-#define IGNITION_PLUGIN_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
-#define IGNITION_PLUGIN_MINOR_VERSION ${PROJECT_VERSION_MINOR}
-#define IGNITION_PLUGIN_PATCH_VERSION ${PROJECT_VERSION_PATCH}
+#define GZ_PLUGIN_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
+#define GZ_PLUGIN_MINOR_VERSION ${PROJECT_VERSION_MINOR}
+#define GZ_PLUGIN_PATCH_VERSION ${PROJECT_VERSION_PATCH}
 
-#define IGNITION_PLUGIN_VERSION "${PROJECT_VERSION}"
-#define IGNITION_PLUGIN_VERSION_FULL "${PROJECT_VERSION_FULL}"
+#define GZ_PLUGIN_VERSION "${PROJECT_VERSION}"
+#define GZ_PLUGIN_VERSION_FULL "${PROJECT_VERSION_FULL}"
 
-#define IGNITION_PLUGIN_VERSION_HEADER "Ignition Plugin, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
-
-namespace [[deprecated("Use gz namespace.")]]  ignition
-{
-   using namespace gz;
-}
+#define GZ_PLUGIN_VERSION_HEADER "Gz Plugin, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
 
 #endif
diff --git a/core/include/ignition/plugin/config.hh b/core/include/ignition/plugin/config.hh
@@ -15,4 +15,26 @@
  *
  */
 
+#ifndef IGNITION_PLUGIN__CONFIG_HH_
+#define IGNITION_PLUGIN__CONFIG_HH_
+
 #include <gz/plugin/config.hh>
+
+#define IGNITION_PLUGIN_MAJOR_VERSION GZ_PLUGIN_MAJOR_VERSION
+#define IGNITION_PLUGIN_MINOR_VERSION GZ_PLUGIN_MINOR_VERSION
+#define IGNITION_PLUGIN_PATCH_VERSION GZ_PLUGIN_PATCH_VERSION
+
+#define IGNITION_PLUGIN_VERSION GZ_PLUGIN_VERSION
+#define IGNITION_PLUGIN_VERSION_FULL GZ_PLUGIN_VERSION_FULL
+
+#define IGNITION_PLUGIN_VERSION_HEADER GZ_PLUGIN_VERSION_HEADER
+
+namespace ignition
+{
+  #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION
+    #pragma message("ignition namespace is deprecated! Use gz instead!")
+  #endif
+  using namespace gz;
+}
+
+#endif