Merge branch 'main' into remove_boost

gazebosim · Jan 26, 2022 · 7acb8e0 · 7acb8e0
2 parents 498518f + daf976d
commit 7acb8e0
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 202 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 Build | Status
 -- | --
 Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-common/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-common)
-Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_common-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_common-ci-main-bionic-amd64)
+Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_common-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_common-ci-main-focal-amd64)
 Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_common-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_common-ci-main-homebrew-amd64)
 Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_common-ci-main-windows7-amd64)](https://build.osrfoundation.org/job/ignition_common-ci-main-windows7-amd64)
 

diff --git a/av/include/ignition/common/AudioDecoder.hh b/av/include/ignition/common/AudioDecoder.hh
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -66,10 +66,10 @@ namespace ignition
       /// \brief Free audio object, close files, streams.
       private: void Cleanup();
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Private data pointer
       private: std::unique_ptr<AudioDecoderPrivate> data;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/av/include/ignition/common/HWEncoder.hh b/av/include/ignition/common/HWEncoder.hh
@@ -22,7 +22,6 @@
 
 #include <ignition/common/FlagSet.hh>
 #include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/HWVideo.hh>
 #include <ignition/common/ffmpeg_inc.hh>
 

diff --git a/av/include/ignition/common/Video.hh b/av/include/ignition/common/Video.hh
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 struct AVFormatContext;
 struct AVCodecContext;
@@ -76,10 +76,10 @@ namespace ignition
       /// \brief free up open Video object, close files, streams
       private: void Cleanup();
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Private data pointer
       private: std::unique_ptr<VideoPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/av/include/ignition/common/VideoEncoder.hh b/av/include/ignition/common/VideoEncoder.hh
@@ -24,8 +24,8 @@
 
 #include <ignition/common/FlagSet.hh>
 #include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/HWVideo.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 // Default bitrate (0) indicates that a bitrate should be calculated when
 // Start is called.
@@ -221,11 +221,11 @@ namespace ignition
       /// memory. This will also delete any temporary files.
       public: void Reset();
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \internal
       /// \brief Private data pointer
       private: std::unique_ptr<VideoEncoderPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/events/include/ignition/common/KeyEvent.hh b/events/include/ignition/common/KeyEvent.hh
@@ -21,7 +21,7 @@
 #include <string>
 
 #include <ignition/common/events/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -110,10 +110,10 @@ namespace ignition
       /// \return this
       public: KeyEvent& operator=(KeyEvent&& other);
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Private data pointer
       private: std::unique_ptr<KeyEventPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/events/include/ignition/common/MouseEvent.hh b/events/include/ignition/common/MouseEvent.hh
@@ -21,7 +21,7 @@
 #include <ignition/math/Vector2.hh>
 
 #include <ignition/common/events/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -203,11 +203,11 @@ namespace ignition
       /// \return this
       public: MouseEvent &operator=(const MouseEvent &_other);
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \internal
       /// \brief Private data pointer
       private: std::unique_ptr<MouseEventPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/graphics/include/ignition/common/SubMesh.hh b/graphics/include/ignition/common/SubMesh.hh
@@ -28,7 +28,6 @@
 
 #include <ignition/common/graphics/Types.hh>
 #include <ignition/common/graphics/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
 
 namespace ignition
 {

diff --git a/include/ignition/common/Console.hh b/include/ignition/common/Console.hh
@@ -25,7 +25,7 @@
 
 #include <ignition/common/Util.hh>
 #include <ignition/common/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -123,11 +123,11 @@ namespace ignition
                    public: std::ofstream *stream;
                  };
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Stores the full path of the directory where all the log files
       /// are stored.
       private: std::string logDirectory;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief True if initialized.
       private: bool initialized;
@@ -212,10 +212,10 @@ namespace ignition
                    public: std::mutex syncMutex;
                  };
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief Prefix to use when logging to file.
       private: std::string prefix;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
 
     /// \class Console Console.hh common/common.hh
@@ -275,10 +275,10 @@ namespace ignition
       /// \brief The level of verbosity, the default level is 1.
       private: static int verbosity;
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief A custom prefix. See SetPrefix().
       private: static std::string customPrefix;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/include/ignition/common/Plugin.hh b/include/ignition/common/Plugin.hh
@@ -24,7 +24,7 @@
 #include <string>
 
 #include <ignition/common/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -180,10 +180,10 @@ namespace ignition
       private: InterfaceMap::iterator PrivateGetOrCreateIterator(
           const std::string &_interfaceName);
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief PIMPL pointer to the implementation of this class.
       private: const std::unique_ptr<PluginPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief Virtual destructor
       public: virtual ~Plugin();

diff --git a/include/ignition/common/PluginLoader.hh b/include/ignition/common/PluginLoader.hh
@@ -25,8 +25,8 @@
 #include <unordered_set>
 
 #include <ignition/common/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
 #include <ignition/common/PluginPtr.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 namespace ignition
 {
@@ -91,10 +91,10 @@ namespace ignition
       private: const PluginInfo *PrivateGetPluginInfo(
                   const std::string &_pluginName) const;
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief PIMPL pointer to class implementation
       private: std::unique_ptr<PluginLoaderPrivate> dataPtr;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
     };
   }
 }

diff --git a/include/ignition/common/SuppressWarning.hh b/include/ignition/common/SuppressWarning.hh
@@ -15,11 +15,15 @@
  *
  */
 
-
 #ifndef IGNITION_COMMON_SUPPRESSWARNING_HH_
 #define IGNITION_COMMON_SUPPRESSWARNING_HH_
 
-#include <ignition/common/detail/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
+
+#pragma message("ign-common SuppressWarning is deprecated, use ign-utils")
+// These macros have been moved to ign-utils so they may be more broadly used.
+// The implementations are aliases to those implementations and are deprecated
+// in ign-common5 and are to be removed in ign-common6
 
 // This header contains cross-platform macros for suppressing warnings. Please
 // only use these macros responsibly when you are certain that the compiler is
@@ -50,10 +54,10 @@
 /// of our implementation) that the pointer is definitely not pointing to a more
 /// derived type.
 #define IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR \
-  DETAIL_IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR
+  IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR
 
 #define IGN_COMMON_WARN_RESUME__DELETE_NON_VIRTUAL_DESTRUCTOR \
-  DETAIL_IGN_COMMON_WARN_RESUME__DELETE_NON_VIRTUAL_DESTRUCTOR
+  IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR
 
 
 /// \brief Microsoft Visual Studio does not automatically export the interface
@@ -62,14 +66,9 @@
 /// choose to suppress the warning instead of needlessly adding the class
 /// information to the DLL interface.
 #define IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING \
-  DETAIL_IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+  IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
 
 #define IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING \
-  DETAIL_IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
-
-
-// TODO(anyone): Add more warning types as they become relevant.
-// Do not add warning
-// types to suppress unless they are genuinely necessary.
+  IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
 
 #endif
diff --git a/include/ignition/common/Timer.hh b/include/ignition/common/Timer.hh
@@ -18,7 +18,7 @@
 #define IGNITION_COMMON_TIMER_HH_
 
 #include <ignition/common/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <chrono>
 #include <iostream>
@@ -59,13 +59,13 @@ namespace ignition
                 return out;
               }
 
-      IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
       /// \brief The time of the last call to Start
       private: std::chrono::steady_clock::time_point start;
 
       /// \brief The time when Stop was called.
       private: std::chrono::steady_clock::time_point stop;
-      IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
+      IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
 
       /// \brief True if the timer is running.
       private: bool running;

diff --git a/include/ignition/common/detail/PluginMacros.hh b/include/ignition/common/detail/PluginMacros.hh
@@ -25,7 +25,7 @@
 #include <unordered_set>
 #include <utility>
 #include "ignition/common/PluginInfo.hh"
-#include "ignition/common/SuppressWarning.hh"
+#include "ignition/utils/SuppressWarning.hh"
 
 
 #if defined _WIN32 || defined __CYGWIN__
@@ -63,7 +63,7 @@
 
 #define DETAIL_IGN_COMMON_BEGIN_ADDING_PLUGINS \
   DETAIL_IGN_COMMON_REGISTER_PLUGININFO_META_DATA \
-IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR \
+IGN_UTILS_WARN_IGNORE__NON_VIRTUAL_DESTRUCTOR \
   /* This struct attempts to make sure that the macro is being called from */ \
   /* a global namespace */ \
   struct IGN_macro_must_be_used_in_global_namespace; \
@@ -172,7 +172,7 @@ IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR \
     } \
     return visitedPlugins.size() - _pluginId; \
   } \
-IGN_COMMON_WARN_RESUME__DELETE_NON_VIRTUAL_DESTRUCTOR
+IGN_UTILS_WARN_RESUME__NON_VIRTUAL_DESTRUCTOR
 
 
 #endif