Post-rebase header rectification (header guards and config reordering)

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · May 26, 2022 · d6211d1 · d6211d1
1 parent 78efd1c
commit d6211d1
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 46 deletions.
diff --git a/include/ignition/common/Plugin.hh b/include/ignition/common/Plugin.hh
@@ -15,15 +15,14 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_PLUGIN_HH_
-#define GZ_COMMON_PLUGIN_HH_
+#ifndef IGNITION_COMMON_PLUGIN_HH_
+#define IGNITION_COMMON_PLUGIN_HH_
 
 #include <memory>
 #include <map>
 #include <string>
 
+#include <ignition/common/config.hh>
 #include <gz/common/Export.hh>
 #include <gz/utils/SuppressWarning.hh>
 

diff --git a/include/ignition/common/PluginInfo.hh b/include/ignition/common/PluginInfo.hh
@@ -15,14 +15,14 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_PLUGININFO_HH_
-#define GZ_COMMON_PLUGININFO_HH_
+#ifndef IGNITION_COMMON_PLUGININFO_HH_
+#define IGNITION_COMMON_PLUGININFO_HH_
 
 #include <functional>
 #include <string>
 #include <unordered_map>
+
+#include <ignition/common/config.hh>
 #include <gz/common/Export.hh>
 
 namespace ignition

diff --git a/include/ignition/common/PluginLoader.hh b/include/ignition/common/PluginLoader.hh
@@ -15,16 +15,15 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_PLUGINLOADER_HH_
-#define GZ_COMMON_PLUGINLOADER_HH_
+#ifndef IGNITION_COMMON_PLUGINLOADER_HH_
+#define IGNITION_COMMON_PLUGINLOADER_HH_
 
 #include <memory>
 #include <string>
 #include <typeinfo>
 #include <unordered_set>
 
+#include <ignition/common/config.hh>
 #include <gz/common/Export.hh>
 #include <ignition/common/PluginPtr.hh>
 #include <gz/utils/SuppressWarning.hh>

diff --git a/include/ignition/common/PluginMacros.hh b/include/ignition/common/PluginMacros.hh
@@ -16,9 +16,10 @@
 */
 
 
-#ifndef GZ_COMMON_REGISTERMACROS_HH_
-#define GZ_COMMON_REGISTERMACROS_HH_
+#ifndef IGNITION_COMMON_REGISTERMACROS_HH_
+#define IGNITION_COMMON_REGISTERMACROS_HH_
 
+#include <ignition/common/config.hh>
 #include "ignition/common/detail/PluginMacros.hh"
 
 // Deprecated, use gz-plugin
@@ -98,7 +99,6 @@
 // doing something that is not permitted). Recommended practice is to have a
 // single source file (e.g. plugins.cpp) in your library's codebase that is
 // dedicated to hosting these macros.
-#include <ignition/common/config.hh>
 
 
 /// \brief Begin registering a set of plugins that are contained within this

diff --git a/include/ignition/common/PluginPtr.hh b/include/ignition/common/PluginPtr.hh
@@ -15,15 +15,14 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_PLUGINPTR_HH_
-#define GZ_COMMON_PLUGINPTR_HH_
+#ifndef IGNITION_COMMON_PLUGINPTR_HH_
+#define IGNITION_COMMON_PLUGINPTR_HH_
 
 #include <map>
 #include <string>
 #include <memory>
 
+#include <ignition/common/config.hh>
 #include "ignition/common/Plugin.hh"
 
 namespace ignition

diff --git a/include/ignition/common/SpecializedPlugin.hh b/include/ignition/common/SpecializedPlugin.hh
@@ -14,11 +14,10 @@
  * limitations under the License.
  *
  */
-#ifndef GZ_COMMON_SPECIALIZEDPLUGIN_HH_
-#define GZ_COMMON_SPECIALIZEDPLUGIN_HH_
+#ifndef IGNITION_COMMON_SPECIALIZEDPLUGIN_HH_
+#define IGNITION_COMMON_SPECIALIZEDPLUGIN_HH_
 
 #include <ignition/common/config.hh>
-
 #include "ignition/common/Plugin.hh"
 
 namespace ignition

diff --git a/include/ignition/common/SpecializedPluginPtr.hh b/include/ignition/common/SpecializedPluginPtr.hh
@@ -15,11 +15,10 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_
-#define GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_
+#ifndef IGNITION_COMMON_SPECIALIZEDPLUGINPTR_HH_
+#define IGNITION_COMMON_SPECIALIZEDPLUGINPTR_HH_
 
+#include <ignition/common/config.hh>
 #include "ignition/common/PluginPtr.hh"
 #include "ignition/common/SpecializedPlugin.hh"
 

diff --git a/include/ignition/common/detail/Plugin.hh b/include/ignition/common/detail/Plugin.hh
@@ -15,13 +15,12 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_DETAIL_PLUGIN_HH_
-#define GZ_COMMON_DETAIL_PLUGIN_HH_
+#ifndef IGNITION_COMMON_DETAIL_PLUGIN_HH_
+#define IGNITION_COMMON_DETAIL_PLUGIN_HH_
 
 #include <memory>
 #include <string>
+#include <ignition/common/config.hh>
 #include "ignition/common/Plugin.hh"
 
 namespace ignition

diff --git a/include/ignition/common/detail/PluginLoader.hh b/include/ignition/common/detail/PluginLoader.hh
@@ -15,12 +15,11 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_DETAIL_PLUGINLOADER_HH_
-#define GZ_COMMON_DETAIL_PLUGINLOADER_HH_
+#ifndef IGNITION_COMMON_DETAIL_PLUGINLOADER_HH_
+#define IGNITION_COMMON_DETAIL_PLUGINLOADER_HH_
 
 #include <string>
+#include <ignition/common/config.hh>
 #include "ignition/common/PluginLoader.hh"
 
 namespace ignition

diff --git a/include/ignition/common/detail/PluginMacros.hh b/include/ignition/common/detail/PluginMacros.hh
@@ -15,16 +15,15 @@
  *
 */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_DETAIL_PLUGINMACROS_HH_
-#define GZ_COMMON_DETAIL_PLUGINMACROS_HH_
+#ifndef IGNITION_COMMON_DETAIL_PLUGINMACROS_HH_
+#define IGNITION_COMMON_DETAIL_PLUGINMACROS_HH_
 
 #include <string>
 #include <typeinfo>
 #include <type_traits>
 #include <unordered_set>
 #include <utility>
+#include <ignition/common/config.hh>
 #include "ignition/common/PluginInfo.hh"
 #include "gz/utils/SuppressWarning.hh"
 

diff --git a/include/ignition/common/detail/PluginPtr.hh b/include/ignition/common/detail/PluginPtr.hh
@@ -15,13 +15,12 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_DETAIL_PLUGINPTR_HH_
-#define GZ_COMMON_DETAIL_PLUGINPTR_HH_
+#ifndef IGNITION_COMMON_DETAIL_PLUGINPTR_HH_
+#define IGNITION_COMMON_DETAIL_PLUGINPTR_HH_
 #include <memory>
 #include <utility>
 
+#include <ignition/common/config.hh>
 #include "ignition/common/PluginPtr.hh"
 #include "gz/common/TemplateHelpers.hh"
 

diff --git a/include/ignition/common/detail/SpecializedPlugin.hh b/include/ignition/common/detail/SpecializedPlugin.hh
@@ -15,11 +15,10 @@
  *
  */
 
-#include <ignition/common/config.hh>
-
-#ifndef GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_
-#define GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_
+#ifndef IGNITION_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_
+#define IGNITION_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_
 
+#include <ignition/common/config.hh>
 #include "ignition/common/SpecializedPlugin.hh"
 #include <memory>
 

diff --git a/src/PluginLoader_TEST.cc b/src/PluginLoader_TEST.cc
@@ -17,6 +17,8 @@
 
 #include <gtest/gtest.h>
 
+#define SUPPRESS_IGNITION_HEADER_DEPRECATION
+
 #include <algorithm>
 #include <fstream>
 
@@ -99,3 +101,5 @@ TEST(PluginLoader, InstantiateUnloadedPlugin)
   EXPECT_FALSE(plugin);
 }
 IGN_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
+
+#undef SUPPRESS_IGNITION_HEADER_DEPRECATION