From 9283a2cadb38c0204f3c454afd5c2ddec88a6863 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 26 Aug 2022 13:17:01 -0700 Subject: [PATCH] Leave ignition as primary in headers to fix ABI Signed-off-by: methylDragon --- av/include/gz/common/AudioDecoder.hh | 2 +- av/include/gz/common/HWEncoder.hh | 2 +- av/include/gz/common/HWVideo.hh | 2 +- av/include/gz/common/Video.hh | 2 +- av/include/gz/common/VideoEncoder.hh | 2 +- av/include/gz/common/av/Util.hh | 2 +- av/include/gz/common/ffmpeg_inc.hh | 2 +- av/src/AudioDecoder.cc | 2 +- av/src/AudioDecoder_TEST.cc | 2 +- av/src/HWEncoder.cc | 2 +- av/src/Video.cc | 2 +- av/src/VideoEncoder.cc | 2 +- av/src/VideoEncoder_TEST.cc | 2 +- av/src/ffmpeg_inc.cc | 2 +- events/include/gz/common/Event.hh | 2 +- events/include/gz/common/KeyEvent.hh | 2 +- events/include/gz/common/MouseEvent.hh | 2 +- events/include/gz/common/events/Types.hh | 2 +- events/src/Event.cc | 2 +- events/src/Event_TEST.cc | 2 +- events/src/KeyEvent.cc | 2 +- events/src/KeyEvent_TEST.cc | 2 +- events/src/MouseEvent.cc | 2 +- events/src/MouseEvent_TEST.cc | 2 +- examples/events.cc | 2 +- graphics/include/gz/common/Animation.hh | 2 +- graphics/include/gz/common/BVHLoader.hh | 2 +- graphics/include/gz/common/ColladaExporter.hh | 2 +- graphics/include/gz/common/ColladaLoader.hh | 2 +- graphics/include/gz/common/Dem.hh | 2 +- graphics/include/gz/common/GTSMeshUtils.hh | 2 +- graphics/include/gz/common/HeightmapData.hh | 2 +- graphics/include/gz/common/Image.hh | 2 +- graphics/include/gz/common/ImageHeightmap.hh | 2 +- graphics/include/gz/common/KeyFrame.hh | 2 +- graphics/include/gz/common/Material.hh | 2 +- graphics/include/gz/common/Mesh.hh | 2 +- graphics/include/gz/common/MeshCSG.hh | 2 +- graphics/include/gz/common/MeshExporter.hh | 2 +- graphics/include/gz/common/MeshLoader.hh | 2 +- graphics/include/gz/common/MeshManager.hh | 2 +- graphics/include/gz/common/NodeAnimation.hh | 2 +- graphics/include/gz/common/NodeTransform.hh | 2 +- graphics/include/gz/common/OBJLoader.hh | 2 +- graphics/include/gz/common/Pbr.hh | 2 +- graphics/include/gz/common/STLLoader.hh | 2 +- graphics/include/gz/common/SVGLoader.hh | 2 +- graphics/include/gz/common/Skeleton.hh | 2 +- .../include/gz/common/SkeletonAnimation.hh | 2 +- graphics/include/gz/common/SkeletonNode.hh | 2 +- graphics/include/gz/common/SubMesh.hh | 2 +- graphics/include/gz/common/graphics/Types.hh | 2 +- graphics/src/Animation.cc | 6 +++--- graphics/src/Animation_TEST.cc | 2 +- graphics/src/BVHLoader.cc | 2 +- graphics/src/ColladaExporter.cc | 2 +- graphics/src/ColladaExporter_TEST.cc | 2 +- graphics/src/ColladaLoader.cc | 4 ++-- graphics/src/ColladaLoader_TEST.cc | 2 +- graphics/src/Dem.cc | 2 +- graphics/src/Dem_TEST.cc | 2 +- graphics/src/GTSMeshUtils.cc | 2 +- graphics/src/GTSMeshUtils_TEST.cc | 2 +- graphics/src/Image.cc | 4 ++-- graphics/src/ImageHeightmap.cc | 2 +- graphics/src/ImageHeightmap_TEST.cc | 2 +- graphics/src/Image_TEST.cc | 2 +- graphics/src/KeyFrame.cc | 2 +- graphics/src/Material.cc | 2 +- graphics/src/Material_TEST.cc | 2 +- graphics/src/Mesh.cc | 2 +- graphics/src/MeshCSG.cc | 2 +- graphics/src/MeshExporter.cc | 2 +- graphics/src/MeshManager.cc | 2 +- graphics/src/MeshManager_TEST.cc | 2 +- graphics/src/Mesh_TEST.cc | 2 +- graphics/src/NodeAnimation.cc | 4 +--- graphics/src/NodeTransform.cc | 2 +- graphics/src/OBJLoader.cc | 4 ++-- graphics/src/OBJLoader_TEST.cc | 2 +- graphics/src/Pbr.cc | 2 +- graphics/src/STLLoader.cc | 2 +- graphics/src/SVGLoader.cc | 2 +- graphics/src/SVGLoader_TEST.cc | 2 +- graphics/src/Skeleton.cc | 2 +- graphics/src/SkeletonAnimation.cc | 2 +- graphics/src/SkeletonNode.cc | 2 +- graphics/src/SubMesh.cc | 2 +- graphics/src/SubMesh_TEST.cc | 2 +- graphics/src/tiny_obj_loader.h | 8 ++++---- graphics/src/tinyxml2/tinyxml2.cpp | 2 +- graphics/src/tinyxml2/tinyxml2.h | 2 +- include/gz/common/Base64.hh | 2 +- include/gz/common/Battery.hh | 2 +- include/gz/common/Console.hh | 18 +++++++++--------- include/gz/common/EnumIface.hh | 4 ++-- include/gz/common/Filesystem.hh | 2 +- include/gz/common/FlagSet.hh | 16 +++++++++------- include/gz/common/MaterialDensity.hh | 2 +- include/gz/common/MovingWindowFilter.hh | 2 +- include/gz/common/Plugin.hh | 2 +- include/gz/common/PluginInfo.hh | 2 +- include/gz/common/PluginLoader.hh | 2 +- include/gz/common/PluginPtr.hh | 4 ++-- include/gz/common/SignalHandler.hh | 4 ++-- include/gz/common/SingletonT.hh | 2 +- include/gz/common/SpecializedPlugin.hh | 2 +- include/gz/common/SpecializedPluginPtr.hh | 2 +- include/gz/common/StringUtils.hh | 2 +- include/gz/common/SuppressWarning.hh | 1 + include/gz/common/SystemPaths.hh | 6 +++--- include/gz/common/TemplateHelpers.hh | 2 +- include/gz/common/Time.hh | 6 +++--- include/gz/common/Timer.hh | 4 ++-- include/gz/common/URI.hh | 2 +- include/gz/common/Util.hh | 8 ++++---- include/gz/common/Uuid.hh | 4 ++-- include/gz/common/WorkerPool.hh | 2 +- include/gz/common/config.hh.in | 9 +++++++++ include/gz/common/detail/Plugin.hh | 2 +- include/gz/common/detail/PluginLoader.hh | 2 +- include/gz/common/detail/PluginMacros.hh | 16 ++++++++-------- include/gz/common/detail/PluginPtr.hh | 6 +++--- include/gz/common/detail/SpecializedPlugin.hh | 4 ++-- include/gz/common/detail/TemplateHelpers.hh | 2 +- include/ignition/common/config.hh | 6 +++--- profiler/include/gz/common/Profiler.hh | 12 ++++++------ profiler/src/Profiler.cc | 2 +- profiler/src/ProfilerImpl.hh | 2 +- profiler/src/Profiler_Disabled_TEST.cc | 2 +- profiler/src/Profiler_Remotery_TEST.cc | 2 +- profiler/src/RemoteryProfilerImpl.cc | 2 +- profiler/src/RemoteryProfilerImpl.hh | 2 +- src/Base64.cc | 2 +- src/Base64_TEST.cc | 2 +- src/Battery.cc | 2 +- src/Battery_TEST.cc | 2 +- src/Console.cc | 2 +- src/Console_TEST.cc | 4 ++-- src/EnumIface_TEST.cc | 2 +- src/Filesystem.cc | 2 +- src/FilesystemBoost.cc | 2 +- src/Filesystem_TEST.cc | 2 +- src/FlagSet_TEST.cc | 6 +++--- src/MaterialDensity.cc | 2 +- src/MaterialDensity_TEST.cc | 2 +- src/MovingWindowFilter_TEST.cc | 2 +- src/Plugin.cc | 2 +- src/PluginLoader.cc | 2 +- src/PluginUtils.hh | 2 +- src/PluginUtils_TEST.cc | 2 +- src/PrintWindowsSystemWarning.hh | 2 +- src/SignalHandler.cc | 2 +- src/SignalHandler_TEST.cc | 2 +- src/StringUtils.cc | 2 +- src/StringUtils_TEST.cc | 2 +- src/SystemPaths.cc | 2 +- src/SystemPaths_TEST.cc | 2 +- src/TemplateHelpers_TEST.cc | 2 +- src/Time.cc | 2 +- src/Time_TEST.cc | 2 +- src/Timer.cc | 2 +- src/URI.cc | 2 +- src/URI_TEST.cc | 2 +- src/Util_TEST.cc | 2 +- src/Uuid.cc | 2 +- src/Uuid_TEST.cc | 2 +- src/WorkerPool.cc | 2 +- test/integration/console.cc | 2 +- test/integration/deprecated_TEST.cc | 2 +- test/integration/encoder_timing.cc | 2 +- test/integration/mesh.cc | 2 +- test/integration/video_encoder.cc | 2 +- test/test_config.h.in | 14 +++++++------- 174 files changed, 244 insertions(+), 234 deletions(-) diff --git a/av/include/gz/common/AudioDecoder.hh b/av/include/gz/common/AudioDecoder.hh index d347016a3..aff0e8107 100644 --- a/av/include/gz/common/AudioDecoder.hh +++ b/av/include/gz/common/AudioDecoder.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/av/include/gz/common/HWEncoder.hh b/av/include/gz/common/HWEncoder.hh index 8dd6108b1..2e48c2d08 100644 --- a/av/include/gz/common/HWEncoder.hh +++ b/av/include/gz/common/HWEncoder.hh @@ -28,7 +28,7 @@ /// This is an internal-use only class encapsulating HW video encoding. All /// symbols defined here are hidden from the public API. -namespace gz::common +namespace ignition::common { // Forward declare private data class class HWVideoPrivate; diff --git a/av/include/gz/common/HWVideo.hh b/av/include/gz/common/HWVideo.hh index 9201e5aaf..704624bb5 100644 --- a/av/include/gz/common/HWVideo.hh +++ b/av/include/gz/common/HWVideo.hh @@ -18,7 +18,7 @@ #include -namespace gz::common +namespace ignition::common { enum class IGNITION_COMMON_AV_VISIBLE HWEncoderType { diff --git a/av/include/gz/common/Video.hh b/av/include/gz/common/Video.hh index 3cdabd74d..353a14886 100644 --- a/av/include/gz/common/Video.hh +++ b/av/include/gz/common/Video.hh @@ -29,7 +29,7 @@ struct AVFrame; struct AVPicture; struct SwsContext; -namespace gz +namespace ignition { namespace common { diff --git a/av/include/gz/common/VideoEncoder.hh b/av/include/gz/common/VideoEncoder.hh index ed99ad138..12a2e34c0 100644 --- a/av/include/gz/common/VideoEncoder.hh +++ b/av/include/gz/common/VideoEncoder.hh @@ -35,7 +35,7 @@ #define VIDEO_ENCODER_FPS_DEFAULT 25 #define VIDEO_ENCODER_FORMAT_DEFAULT "mp4" -namespace gz +namespace ignition { namespace common { diff --git a/av/include/gz/common/av/Util.hh b/av/include/gz/common/av/Util.hh index 8bc433b28..58d3ad756 100644 --- a/av/include/gz/common/av/Util.hh +++ b/av/include/gz/common/av/Util.hh @@ -18,7 +18,7 @@ #ifndef GZ_COMMON_AV_UTIL_HH_ #define GZ_COMMON_AV_UTIL_HH_ -namespace gz +namespace ignition { namespace common { diff --git a/av/include/gz/common/ffmpeg_inc.hh b/av/include/gz/common/ffmpeg_inc.hh index f5d162a33..5ca16c5a9 100644 --- a/av/include/gz/common/ffmpeg_inc.hh +++ b/av/include/gz/common/ffmpeg_inc.hh @@ -51,7 +51,7 @@ extern "C" { #include -namespace gz +namespace ignition { namespace common { diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc index 67ef936e5..32fef0779 100644 --- a/av/src/AudioDecoder.cc +++ b/av/src/AudioDecoder.cc @@ -23,7 +23,7 @@ #define AUDIO_INBUF_SIZE (20480 * 2) #define AUDIO_REFILL_THRESH 4096 -using namespace gz; +using namespace ignition; using namespace common; class gz::common::AudioDecoderPrivate diff --git a/av/src/AudioDecoder_TEST.cc b/av/src/AudioDecoder_TEST.cc index 9a3295884..ed77faa5a 100644 --- a/av/src/AudioDecoder_TEST.cc +++ b/av/src/AudioDecoder_TEST.cc @@ -21,7 +21,7 @@ #include "test_config.h" -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// TEST(AudioDecoder, FileNotSet) diff --git a/av/src/HWEncoder.cc b/av/src/HWEncoder.cc index 1e92f21aa..9daaf646b 100644 --- a/av/src/HWEncoder.cc +++ b/av/src/HWEncoder.cc @@ -25,7 +25,7 @@ #include "gz/common/StringUtils.hh" #include "gz/common/Console.hh" -using namespace gz; +using namespace ignition; using namespace common; using namespace std; diff --git a/av/src/Video.cc b/av/src/Video.cc index f5feb36af..2e916f089 100644 --- a/av/src/Video.cc +++ b/av/src/Video.cc @@ -20,7 +20,7 @@ #include "gz/common/Video.hh" #include "gz/common/av/Util.hh" -using namespace gz; +using namespace ignition; using namespace common; // Private data structure for the Video class diff --git a/av/src/VideoEncoder.cc b/av/src/VideoEncoder.cc index 4db7547c8..34f7e617b 100644 --- a/av/src/VideoEncoder.cc +++ b/av/src/VideoEncoder.cc @@ -28,7 +28,7 @@ #include "gz/common/HWEncoder.hh" #endif -using namespace gz; +using namespace ignition; using namespace common; using namespace std; diff --git a/av/src/VideoEncoder_TEST.cc b/av/src/VideoEncoder_TEST.cc index 131db8b30..a51d9883d 100644 --- a/av/src/VideoEncoder_TEST.cc +++ b/av/src/VideoEncoder_TEST.cc @@ -19,7 +19,7 @@ #include "gz/common/VideoEncoder.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; using namespace common; class VideoEncoderTest : public common::testing::AutoLogFixture diff --git a/av/src/ffmpeg_inc.cc b/av/src/ffmpeg_inc.cc index 2fdfe1f13..287bfbe5c 100644 --- a/av/src/ffmpeg_inc.cc +++ b/av/src/ffmpeg_inc.cc @@ -16,7 +16,7 @@ */ #include "gz/common/ffmpeg_inc.hh" -using namespace gz; +using namespace ignition; ////////////////////////////////////////////////// AVFrame *common::AVFrameAlloc(void) diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh index 462e25341..471c58216 100644 --- a/events/include/gz/common/Event.hh +++ b/events/include/gz/common/Event.hh @@ -29,7 +29,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/events/include/gz/common/KeyEvent.hh b/events/include/gz/common/KeyEvent.hh index 15ae91530..325d3b21d 100644 --- a/events/include/gz/common/KeyEvent.hh +++ b/events/include/gz/common/KeyEvent.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/events/include/gz/common/MouseEvent.hh b/events/include/gz/common/MouseEvent.hh index 2c176c04e..006701a00 100644 --- a/events/include/gz/common/MouseEvent.hh +++ b/events/include/gz/common/MouseEvent.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/events/include/gz/common/events/Types.hh b/events/include/gz/common/events/Types.hh index 39aacfef6..f1ba2544f 100644 --- a/events/include/gz/common/events/Types.hh +++ b/events/include/gz/common/events/Types.hh @@ -21,7 +21,7 @@ #include // This header contains forward declarations for some event types -namespace gz +namespace ignition { namespace common { diff --git a/events/src/Event.cc b/events/src/Event.cc index 6dbd56818..4ccacc5a0 100644 --- a/events/src/Event.cc +++ b/events/src/Event.cc @@ -18,7 +18,7 @@ #include "gz/common/Console.hh" #include "gz/common/Event.hh" -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/events/src/Event_TEST.cc b/events/src/Event_TEST.cc index 37f7144f7..df51685e3 100644 --- a/events/src/Event_TEST.cc +++ b/events/src/Event_TEST.cc @@ -22,7 +22,7 @@ #include #include -using namespace gz; +using namespace ignition; class EventTest : public common::testing::AutoLogFixture { }; diff --git a/events/src/KeyEvent.cc b/events/src/KeyEvent.cc index 829b3f659..285d6c973 100644 --- a/events/src/KeyEvent.cc +++ b/events/src/KeyEvent.cc @@ -16,7 +16,7 @@ */ #include "gz/common/KeyEvent.hh" -using namespace gz; +using namespace ignition; using namespace common; class gz::common::KeyEventPrivate diff --git a/events/src/KeyEvent_TEST.cc b/events/src/KeyEvent_TEST.cc index c622cda5d..1bb875f7c 100644 --- a/events/src/KeyEvent_TEST.cc +++ b/events/src/KeyEvent_TEST.cc @@ -18,7 +18,7 @@ #include #include "gz/common/KeyEvent.hh" -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/events/src/MouseEvent.cc b/events/src/MouseEvent.cc index 3556e55fb..de74e2a61 100644 --- a/events/src/MouseEvent.cc +++ b/events/src/MouseEvent.cc @@ -18,7 +18,7 @@ #include #include "gz/common/MouseEvent.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief Mouse event private data diff --git a/events/src/MouseEvent_TEST.cc b/events/src/MouseEvent_TEST.cc index 82ea8a53f..018a6929a 100644 --- a/events/src/MouseEvent_TEST.cc +++ b/events/src/MouseEvent_TEST.cc @@ -21,7 +21,7 @@ #include "gz/common/MouseEvent.hh" #include "gz/common/config.hh" -using namespace gz; +using namespace ignition; class MouseEvent : public common::testing::AutoLogFixture { }; diff --git a/examples/events.cc b/examples/events.cc index ddba9b85c..82276813c 100644 --- a/examples/events.cc +++ b/examples/events.cc @@ -19,7 +19,7 @@ #include #include -using namespace gz; +using namespace ignition; int g_callback = 0; common::EventT g_event; diff --git a/graphics/include/gz/common/Animation.hh b/graphics/include/gz/common/Animation.hh index 624d84ebf..7969a08a3 100644 --- a/graphics/include/gz/common/Animation.hh +++ b/graphics/include/gz/common/Animation.hh @@ -27,7 +27,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/BVHLoader.hh b/graphics/include/gz/common/BVHLoader.hh index 0877a7da2..db2feb3f2 100644 --- a/graphics/include/gz/common/BVHLoader.hh +++ b/graphics/include/gz/common/BVHLoader.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/ColladaExporter.hh b/graphics/include/gz/common/ColladaExporter.hh index dfca111b2..e5399758f 100644 --- a/graphics/include/gz/common/ColladaExporter.hh +++ b/graphics/include/gz/common/ColladaExporter.hh @@ -27,7 +27,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/ColladaLoader.hh b/graphics/include/gz/common/ColladaLoader.hh index 857c30aa1..372a8c880 100644 --- a/graphics/include/gz/common/ColladaLoader.hh +++ b/graphics/include/gz/common/ColladaLoader.hh @@ -21,7 +21,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Dem.hh b/graphics/include/gz/common/Dem.hh index 7e8593c33..088ef60ab 100644 --- a/graphics/include/gz/common/Dem.hh +++ b/graphics/include/gz/common/Dem.hh @@ -30,7 +30,7 @@ # include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/GTSMeshUtils.hh b/graphics/include/gz/common/GTSMeshUtils.hh index d5e54554f..c92673217 100644 --- a/graphics/include/gz/common/GTSMeshUtils.hh +++ b/graphics/include/gz/common/GTSMeshUtils.hh @@ -27,7 +27,7 @@ struct _GtsSurface; typedef _GtsSurface GtsSurface; -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/HeightmapData.hh b/graphics/include/gz/common/HeightmapData.hh index 4302f43d3..c8fd68084 100644 --- a/graphics/include/gz/common/HeightmapData.hh +++ b/graphics/include/gz/common/HeightmapData.hh @@ -21,7 +21,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Image.hh b/graphics/include/gz/common/Image.hh index 2632dfe71..3ea29d0d0 100644 --- a/graphics/include/gz/common/Image.hh +++ b/graphics/include/gz/common/Image.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/ImageHeightmap.hh b/graphics/include/gz/common/ImageHeightmap.hh index b1a2cee21..edc3d07b8 100644 --- a/graphics/include/gz/common/ImageHeightmap.hh +++ b/graphics/include/gz/common/ImageHeightmap.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/KeyFrame.hh b/graphics/include/gz/common/KeyFrame.hh index 1386d0511..13e25ffc6 100644 --- a/graphics/include/gz/common/KeyFrame.hh +++ b/graphics/include/gz/common/KeyFrame.hh @@ -21,7 +21,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Material.hh b/graphics/include/gz/common/Material.hh index 0442896ae..c4861df8c 100644 --- a/graphics/include/gz/common/Material.hh +++ b/graphics/include/gz/common/Material.hh @@ -27,7 +27,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Mesh.hh b/graphics/include/gz/common/Mesh.hh index a4bd8d3d1..6e50b8921 100644 --- a/graphics/include/gz/common/Mesh.hh +++ b/graphics/include/gz/common/Mesh.hh @@ -28,7 +28,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/MeshCSG.hh b/graphics/include/gz/common/MeshCSG.hh index 4ef5f0a9f..6aed14500 100644 --- a/graphics/include/gz/common/MeshCSG.hh +++ b/graphics/include/gz/common/MeshCSG.hh @@ -26,7 +26,7 @@ typedef _GtsSurface GtsSurface; struct _GPtrArray; typedef _GPtrArray GPtrArray; -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/MeshExporter.hh b/graphics/include/gz/common/MeshExporter.hh index df416ae5d..2372b14a1 100644 --- a/graphics/include/gz/common/MeshExporter.hh +++ b/graphics/include/gz/common/MeshExporter.hh @@ -20,7 +20,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/MeshLoader.hh b/graphics/include/gz/common/MeshLoader.hh index 6b487192f..2a5ca6e94 100644 --- a/graphics/include/gz/common/MeshLoader.hh +++ b/graphics/include/gz/common/MeshLoader.hh @@ -21,7 +21,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/MeshManager.hh b/graphics/include/gz/common/MeshManager.hh index 710d88306..f069d6c81 100644 --- a/graphics/include/gz/common/MeshManager.hh +++ b/graphics/include/gz/common/MeshManager.hh @@ -35,7 +35,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/NodeAnimation.hh b/graphics/include/gz/common/NodeAnimation.hh index ffe22fdc1..82dc844f6 100644 --- a/graphics/include/gz/common/NodeAnimation.hh +++ b/graphics/include/gz/common/NodeAnimation.hh @@ -25,7 +25,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/NodeTransform.hh b/graphics/include/gz/common/NodeTransform.hh index 659911793..d560a2582 100644 --- a/graphics/include/gz/common/NodeTransform.hh +++ b/graphics/include/gz/common/NodeTransform.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/OBJLoader.hh b/graphics/include/gz/common/OBJLoader.hh index 9d7a1fad1..cbfb04c5f 100644 --- a/graphics/include/gz/common/OBJLoader.hh +++ b/graphics/include/gz/common/OBJLoader.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Pbr.hh b/graphics/include/gz/common/Pbr.hh index 0036ae7e0..5dc135027 100644 --- a/graphics/include/gz/common/Pbr.hh +++ b/graphics/include/gz/common/Pbr.hh @@ -20,7 +20,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/STLLoader.hh b/graphics/include/gz/common/STLLoader.hh index 1294671ef..a94b87606 100644 --- a/graphics/include/gz/common/STLLoader.hh +++ b/graphics/include/gz/common/STLLoader.hh @@ -28,7 +28,7 @@ #define ORDER_MAX 10 #define FACE_MAX 200000 -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/SVGLoader.hh b/graphics/include/gz/common/SVGLoader.hh index d6ff9cd30..7f21be18e 100644 --- a/graphics/include/gz/common/SVGLoader.hh +++ b/graphics/include/gz/common/SVGLoader.hh @@ -28,7 +28,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/Skeleton.hh b/graphics/include/gz/common/Skeleton.hh index 9f4220324..8e483cda2 100644 --- a/graphics/include/gz/common/Skeleton.hh +++ b/graphics/include/gz/common/Skeleton.hh @@ -26,7 +26,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/SkeletonAnimation.hh b/graphics/include/gz/common/SkeletonAnimation.hh index a50e7b6f0..699de0267 100644 --- a/graphics/include/gz/common/SkeletonAnimation.hh +++ b/graphics/include/gz/common/SkeletonAnimation.hh @@ -27,7 +27,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/SkeletonNode.hh b/graphics/include/gz/common/SkeletonNode.hh index c851e6433..4011a57b8 100644 --- a/graphics/include/gz/common/SkeletonNode.hh +++ b/graphics/include/gz/common/SkeletonNode.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/SubMesh.hh b/graphics/include/gz/common/SubMesh.hh index fd8540f32..8ceb3b3c3 100644 --- a/graphics/include/gz/common/SubMesh.hh +++ b/graphics/include/gz/common/SubMesh.hh @@ -28,7 +28,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/graphics/include/gz/common/graphics/Types.hh b/graphics/include/gz/common/graphics/Types.hh index 569639007..f1202d2ea 100644 --- a/graphics/include/gz/common/graphics/Types.hh +++ b/graphics/include/gz/common/graphics/Types.hh @@ -21,7 +21,7 @@ #include // This header contains forward declarations for some graphics types -namespace gz +namespace ignition { namespace common { diff --git a/graphics/src/Animation.cc b/graphics/src/Animation.cc index 749399e8f..46cdfe2c8 100644 --- a/graphics/src/Animation.cc +++ b/graphics/src/Animation.cc @@ -24,7 +24,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; namespace @@ -40,14 +40,14 @@ namespace } ///////////////////////////////////////////////// -namespace gz { +namespace ignition { namespace common { class AnimationPrivate { /// \brief true if the animation is interpolated in x public: bool interpolateX = false; }; -} // namespace gz +} // namespace ignition } // namespace common // TODO(luca) Make Animation class follow PIMPL and remove global static map diff --git a/graphics/src/Animation_TEST.cc b/graphics/src/Animation_TEST.cc index d7fb79528..9ddc12449 100644 --- a/graphics/src/Animation_TEST.cc +++ b/graphics/src/Animation_TEST.cc @@ -24,7 +24,7 @@ #include #include -using namespace gz; +using namespace ignition; class AnimationTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/BVHLoader.cc b/graphics/src/BVHLoader.cc index df8947026..6ab960ee5 100644 --- a/graphics/src/BVHLoader.cc +++ b/graphics/src/BVHLoader.cc @@ -24,7 +24,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/graphics/src/ColladaExporter.cc b/graphics/src/ColladaExporter.cc index 12be8d9ba..92a32df78 100644 --- a/graphics/src/ColladaExporter.cc +++ b/graphics/src/ColladaExporter.cc @@ -38,7 +38,7 @@ static const char pathSeparator = '/'; #endif -using namespace gz; +using namespace ignition; using namespace common; static void LogTinyXml2DocumentError( diff --git a/graphics/src/ColladaExporter_TEST.cc b/graphics/src/ColladaExporter_TEST.cc index cb0b9c5e3..1d04981aa 100644 --- a/graphics/src/ColladaExporter_TEST.cc +++ b/graphics/src/ColladaExporter_TEST.cc @@ -28,7 +28,7 @@ #define snprintf _snprintf #endif -using namespace gz; +using namespace ignition; class ColladaExporter : public common::testing::AutoLogFixture { /// \brief Setup the test fixture. This gets called by gtest. diff --git a/graphics/src/ColladaLoader.cc b/graphics/src/ColladaLoader.cc index 65e976f61..ef15c4cb9 100644 --- a/graphics/src/ColladaLoader.cc +++ b/graphics/src/ColladaLoader.cc @@ -38,12 +38,12 @@ #include "gz/common/Util.hh" #include "gz/common/ColladaLoader.hh" -using namespace gz; +using namespace ignition; using namespace common; using RawNodeAnim = std::map >; using RawSkeletonAnim = std::map; -namespace gz +namespace ignition { namespace common { diff --git a/graphics/src/ColladaLoader_TEST.cc b/graphics/src/ColladaLoader_TEST.cc index 9e3ae3402..6ee6d1554 100644 --- a/graphics/src/ColladaLoader_TEST.cc +++ b/graphics/src/ColladaLoader_TEST.cc @@ -24,7 +24,7 @@ #include "gz/common/Skeleton.hh" #include "gz/common/SkeletonAnimation.hh" -using namespace gz; +using namespace ignition; class ColladaLoader : public common::testing::AutoLogFixture { }; ///////////////////////////////////////////////// diff --git a/graphics/src/Dem.cc b/graphics/src/Dem.cc index dab7614f4..9344ff490 100644 --- a/graphics/src/Dem.cc +++ b/graphics/src/Dem.cc @@ -27,7 +27,7 @@ #include "gz/common/Dem.hh" #include "gz/math/SphericalCoordinates.hh" -using namespace gz; +using namespace ignition; using namespace common; #ifdef HAVE_GDAL diff --git a/graphics/src/Dem_TEST.cc b/graphics/src/Dem_TEST.cc index 266ec66fd..fefc726ba 100644 --- a/graphics/src/Dem_TEST.cc +++ b/graphics/src/Dem_TEST.cc @@ -22,7 +22,7 @@ #include "gz/common/Dem.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; class DemTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/GTSMeshUtils.cc b/graphics/src/GTSMeshUtils.cc index 97867d39f..f2f16ab65 100644 --- a/graphics/src/GTSMeshUtils.cc +++ b/graphics/src/GTSMeshUtils.cc @@ -23,7 +23,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/GTSMeshUtils_TEST.cc b/graphics/src/GTSMeshUtils_TEST.cc index 9ba42ad06..0de5c4f7f 100644 --- a/graphics/src/GTSMeshUtils_TEST.cc +++ b/graphics/src/GTSMeshUtils_TEST.cc @@ -23,7 +23,7 @@ #include "gz/common/Mesh.hh" #include "gz/common/SubMesh.hh" -using namespace gz; +using namespace ignition; class GTSMeshUtils : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/Image.cc b/graphics/src/Image.cc index 512a0d866..f1571eaa6 100644 --- a/graphics/src/Image.cc +++ b/graphics/src/Image.cc @@ -25,10 +25,10 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; -namespace gz +namespace ignition { namespace common { diff --git a/graphics/src/ImageHeightmap.cc b/graphics/src/ImageHeightmap.cc index beafea05f..e2b9854b9 100644 --- a/graphics/src/ImageHeightmap.cc +++ b/graphics/src/ImageHeightmap.cc @@ -17,7 +17,7 @@ #include "gz/common/Console.hh" #include "gz/common/ImageHeightmap.hh" -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/ImageHeightmap_TEST.cc b/graphics/src/ImageHeightmap_TEST.cc index 381178969..fa4f52720 100644 --- a/graphics/src/ImageHeightmap_TEST.cc +++ b/graphics/src/ImageHeightmap_TEST.cc @@ -21,7 +21,7 @@ #define ELEVATION_TOL 1e-8 -using namespace gz; +using namespace ignition; class ImageHeightmapTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/Image_TEST.cc b/graphics/src/Image_TEST.cc index ba11e5539..e013a9743 100644 --- a/graphics/src/Image_TEST.cc +++ b/graphics/src/Image_TEST.cc @@ -20,7 +20,7 @@ #include #include "test_config.h" -using namespace gz; +using namespace ignition; class ImageTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/KeyFrame.cc b/graphics/src/KeyFrame.cc index 045f258d0..952f4728a 100644 --- a/graphics/src/KeyFrame.cc +++ b/graphics/src/KeyFrame.cc @@ -16,7 +16,7 @@ */ #include -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/graphics/src/Material.cc b/graphics/src/Material.cc index 5986a1f1a..50e1779dd 100644 --- a/graphics/src/Material.cc +++ b/graphics/src/Material.cc @@ -20,7 +20,7 @@ #include "gz/common/Material.hh" #include "gz/common/Console.hh" -using namespace gz; +using namespace ignition; using namespace common; IGN_ENUM(shadeModeIface, Material::ShadeMode, diff --git a/graphics/src/Material_TEST.cc b/graphics/src/Material_TEST.cc index 51c2369e2..67366ece6 100644 --- a/graphics/src/Material_TEST.cc +++ b/graphics/src/Material_TEST.cc @@ -20,7 +20,7 @@ #include "gz/common/Material.hh" #include "gz/common/Pbr.hh" -using namespace gz; +using namespace ignition; class MaterialTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/Mesh.cc b/graphics/src/Mesh.cc index a6cc40b96..f3891700c 100644 --- a/graphics/src/Mesh.cc +++ b/graphics/src/Mesh.cc @@ -26,7 +26,7 @@ #include "gz/common/SubMesh.hh" #include "gz/common/Mesh.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief Private data for Mesh diff --git a/graphics/src/MeshCSG.cc b/graphics/src/MeshCSG.cc index 778d1f3a6..8e4813173 100644 --- a/graphics/src/MeshCSG.cc +++ b/graphics/src/MeshCSG.cc @@ -24,7 +24,7 @@ #include "gz/common/SubMesh.hh" #include "gz/common/MeshCSG.hh" -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/MeshExporter.cc b/graphics/src/MeshExporter.cc index db5f2cbc3..a267d5055 100644 --- a/graphics/src/MeshExporter.cc +++ b/graphics/src/MeshExporter.cc @@ -16,7 +16,7 @@ */ #include "gz/common/MeshExporter.hh" -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/MeshManager.cc b/graphics/src/MeshManager.cc index 4b225b165..ecb96a289 100644 --- a/graphics/src/MeshManager.cc +++ b/graphics/src/MeshManager.cc @@ -37,7 +37,7 @@ #include "gz/common/MeshManager.hh" -using namespace gz::common; +using namespace ignition::common; class gz::common::MeshManagerPrivate { diff --git a/graphics/src/MeshManager_TEST.cc b/graphics/src/MeshManager_TEST.cc index ca7f8c8ba..0c7798ef1 100644 --- a/graphics/src/MeshManager_TEST.cc +++ b/graphics/src/MeshManager_TEST.cc @@ -23,7 +23,7 @@ #include "gz/common/MeshManager.hh" #include "gz/common/config.hh" -using namespace gz; +using namespace ignition; #ifndef _WIN32 class MeshManager : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/Mesh_TEST.cc b/graphics/src/Mesh_TEST.cc index dc37c6e0d..77268cdeb 100644 --- a/graphics/src/Mesh_TEST.cc +++ b/graphics/src/Mesh_TEST.cc @@ -24,7 +24,7 @@ #include "gz/common/SubMesh.hh" #include "gz/math/Vector3.hh" -using namespace gz; +using namespace ignition; class MeshTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/NodeAnimation.cc b/graphics/src/NodeAnimation.cc index 6eca52f0f..cba56aadd 100644 --- a/graphics/src/NodeAnimation.cc +++ b/graphics/src/NodeAnimation.cc @@ -18,7 +18,7 @@ #include "gz/common/Console.hh" #include "gz/common/NodeAnimation.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief NodeAnimation private data @@ -222,5 +222,3 @@ double NodeAnimation::TimeAtX(const double _x) const return t1 + ((t2 - t1) * (_x - x1) / (x2 - x1)); } - - diff --git a/graphics/src/NodeTransform.cc b/graphics/src/NodeTransform.cc index e126d6833..f7b42848e 100644 --- a/graphics/src/NodeTransform.cc +++ b/graphics/src/NodeTransform.cc @@ -16,7 +16,7 @@ */ #include -using namespace gz; +using namespace ignition; using namespace common; /// \brief Private data for NodeTransform diff --git a/graphics/src/OBJLoader.cc b/graphics/src/OBJLoader.cc index 699ee0b46..7f46b4440 100644 --- a/graphics/src/OBJLoader.cc +++ b/graphics/src/OBJLoader.cc @@ -27,7 +27,7 @@ #define IGNITION_COMMON_TINYOBJLOADER_IMPLEMENTATION #include "tiny_obj_loader.h" -namespace gz +namespace ignition { namespace common { @@ -39,7 +39,7 @@ namespace gz } } -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/OBJLoader_TEST.cc b/graphics/src/OBJLoader_TEST.cc index 62c820cc5..a05afae65 100644 --- a/graphics/src/OBJLoader_TEST.cc +++ b/graphics/src/OBJLoader_TEST.cc @@ -22,7 +22,7 @@ #include "gz/common/Material.hh" #include "gz/common/OBJLoader.hh" -using namespace gz; +using namespace ignition; class OBJLoaderTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/Pbr.cc b/graphics/src/Pbr.cc index 6b3ba3faa..cde56aec9 100644 --- a/graphics/src/Pbr.cc +++ b/graphics/src/Pbr.cc @@ -73,7 +73,7 @@ class gz::common::PbrPrivate }; -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/graphics/src/STLLoader.cc b/graphics/src/STLLoader.cc index 67664598f..46bc29fcf 100644 --- a/graphics/src/STLLoader.cc +++ b/graphics/src/STLLoader.cc @@ -25,7 +25,7 @@ #include "gz/common/SubMesh.hh" #include "gz/common/STLLoader.hh" -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/graphics/src/SVGLoader.cc b/graphics/src/SVGLoader.cc index 1a7c41207..c0678f7fd 100644 --- a/graphics/src/SVGLoader.cc +++ b/graphics/src/SVGLoader.cc @@ -34,7 +34,7 @@ #include "gz/common/SVGLoader.hh" -using namespace gz; +using namespace ignition; using namespace common; class gz::common::SVGLoaderPrivate diff --git a/graphics/src/SVGLoader_TEST.cc b/graphics/src/SVGLoader_TEST.cc index 53705f344..dcf1de7a2 100644 --- a/graphics/src/SVGLoader_TEST.cc +++ b/graphics/src/SVGLoader_TEST.cc @@ -21,7 +21,7 @@ #include "gz/common/SVGLoader.hh" -using namespace gz; +using namespace ignition; using namespace common; diff --git a/graphics/src/Skeleton.cc b/graphics/src/Skeleton.cc index e67f24b9e..8d33820e9 100644 --- a/graphics/src/Skeleton.cc +++ b/graphics/src/Skeleton.cc @@ -20,7 +20,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; /// Private data class diff --git a/graphics/src/SkeletonAnimation.cc b/graphics/src/SkeletonAnimation.cc index a41747622..fc0667375 100644 --- a/graphics/src/SkeletonAnimation.cc +++ b/graphics/src/SkeletonAnimation.cc @@ -19,7 +19,7 @@ #include "gz/common/NodeAnimation.hh" #include "gz/common/SkeletonAnimation.hh" -using namespace gz; +using namespace ignition; using namespace common; /// Prvate data class diff --git a/graphics/src/SkeletonNode.cc b/graphics/src/SkeletonNode.cc index 1236e7c12..950ea4e5c 100644 --- a/graphics/src/SkeletonNode.cc +++ b/graphics/src/SkeletonNode.cc @@ -20,7 +20,7 @@ #include "gz/common/Console.hh" #include "gz/common/SkeletonNode.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief SkeletonNode private data diff --git a/graphics/src/SubMesh.cc b/graphics/src/SubMesh.cc index be1ab9d15..f5c0cb39d 100644 --- a/graphics/src/SubMesh.cc +++ b/graphics/src/SubMesh.cc @@ -25,7 +25,7 @@ #include "gz/common/Material.hh" #include "gz/common/SubMesh.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief Private data for SubMesh diff --git a/graphics/src/SubMesh_TEST.cc b/graphics/src/SubMesh_TEST.cc index e6c3e88cf..60baf394b 100644 --- a/graphics/src/SubMesh_TEST.cc +++ b/graphics/src/SubMesh_TEST.cc @@ -23,7 +23,7 @@ #include "gz/common/SubMesh.hh" #include "gz/common/MeshManager.hh" -using namespace gz; +using namespace ignition; class SubMeshTest : public common::testing::AutoLogFixture { }; diff --git a/graphics/src/tiny_obj_loader.h b/graphics/src/tiny_obj_loader.h index f4be265fb..7c69bd2c2 100644 --- a/graphics/src/tiny_obj_loader.h +++ b/graphics/src/tiny_obj_loader.h @@ -53,7 +53,7 @@ THE SOFTWARE. #include #include -namespace gz +namespace ignition { namespace tinyobj { @@ -397,7 +397,7 @@ void LoadMtl(std::map *material_map, bool ParseTextureNameAndOption(std::string *texname, texture_option_t *texopt, const char *linebuf); } // namespace tinyobj -} // namespace gz +} // namespace ignition #endif // GZ_COMMON_TINY_OBJ_LOADER_H_ @@ -414,7 +414,7 @@ bool ParseTextureNameAndOption(std::string *texname, texture_option_t *texopt, #include #include -namespace gz +namespace ignition { namespace tinyobj { MaterialReader::~MaterialReader() {} @@ -2578,6 +2578,6 @@ bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback, #pragma clang diagnostic pop #endif } // namespace tinyobj -} // namespace gz +} // namespace ignition #endif diff --git a/graphics/src/tinyxml2/tinyxml2.cpp b/graphics/src/tinyxml2/tinyxml2.cpp index 0b239be71..751f52887 100755 --- a/graphics/src/tinyxml2/tinyxml2.cpp +++ b/graphics/src/tinyxml2/tinyxml2.cpp @@ -116,7 +116,7 @@ static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; -namespace gz +namespace ignition { namespace tinyxml2 { diff --git a/graphics/src/tinyxml2/tinyxml2.h b/graphics/src/tinyxml2/tinyxml2.h index d64cbde58..188336280 100755 --- a/graphics/src/tinyxml2/tinyxml2.h +++ b/graphics/src/tinyxml2/tinyxml2.h @@ -95,7 +95,7 @@ distribution. static const int TIXML2_MAJOR_VERSION = 3; static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_PATCH_VERSION = 0; -namespace gz +namespace ignition { namespace tinyxml2 { diff --git a/include/gz/common/Base64.hh b/include/gz/common/Base64.hh index cdb247928..2f128c543 100644 --- a/include/gz/common/Base64.hh +++ b/include/gz/common/Base64.hh @@ -20,7 +20,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/Battery.hh b/include/gz/common/Battery.hh index 13a9f2b5b..05786e9e1 100644 --- a/include/gz/common/Battery.hh +++ b/include/gz/common/Battery.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/Console.hh b/include/gz/common/Console.hh index 23d731a5d..3e2910da6 100644 --- a/include/gz/common/Console.hh +++ b/include/gz/common/Console.hh @@ -26,24 +26,24 @@ #include #include -namespace gz +namespace ignition { namespace common { /// \brief Output an error message, if the verbose level is >= 1 - #define ignerr (gz::common::Console::err(__FILE__, __LINE__)) + #define ignerr (ignition::common::Console::err(__FILE__, __LINE__)) /// \brief Output a warning message, if the verbose level is >= 2 - #define ignwarn (gz::common::Console::warn(__FILE__, __LINE__)) + #define ignwarn (ignition::common::Console::warn(__FILE__, __LINE__)) /// \brief Output a message, if the verbose level is >= 3 - #define ignmsg (gz::common::Console::msg()) + #define ignmsg (ignition::common::Console::msg()) /// \brief Output a debug message, if the verbose level is >= 4 - #define igndbg (gz::common::Console::dbg(__FILE__, __LINE__)) + #define igndbg (ignition::common::Console::dbg(__FILE__, __LINE__)) /// \brief Output a message to a log file, regardless of verbosity level - #define ignlog (gz::common::Console::log()) + #define ignlog (ignition::common::Console::log()) /// \brief Initialize log file with filename given by _dir/_file. /// If called twice, it will close the file currently in use and open a new @@ -53,16 +53,16 @@ namespace gz /// be relative to your home directory. /// \param[in] _file Name of log file for ignlog messages. #define ignLogInit(_dir, _file)\ - gz::common::Console::log.Init(_dir, _file) + ignition::common::Console::log.Init(_dir, _file) /// \brief Close the file used for logging. #define ignLogClose()\ - gz::common::Console::log.Close() + ignition::common::Console::log.Close() /// \brief Get the full path of the directory where the log files are stored /// \return Full path of the directory #define ignLogDirectory()\ - (gz::common::Console::log.LogDirectory()) + (ignition::common::Console::log.LogDirectory()) /// \class FileLogger FileLogger.hh common/common.hh /// \brief A logger that outputs messages to a file. diff --git a/include/gz/common/EnumIface.hh b/include/gz/common/EnumIface.hh index 24d0fae00..b95ce1b39 100644 --- a/include/gz/common/EnumIface.hh +++ b/include/gz/common/EnumIface.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { @@ -38,7 +38,7 @@ namespace gz /// \sa EnumIface /// \sa EnumIterator #define IGN_ENUM(name, enumType, begin, end, ...) \ - static gz::common::EnumIface name( \ + static ignition::common::EnumIface name( \ begin, end, {__VA_ARGS__}); /// \brief Enum interface. Use this interface to convert an enum to diff --git a/include/gz/common/Filesystem.hh b/include/gz/common/Filesystem.hh index 22d943649..d1c2ea326 100644 --- a/include/gz/common/Filesystem.hh +++ b/include/gz/common/Filesystem.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/FlagSet.hh b/include/gz/common/FlagSet.hh index a476479ef..688e0d99f 100644 --- a/include/gz/common/FlagSet.hh +++ b/include/gz/common/FlagSet.hh @@ -11,7 +11,7 @@ * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in + * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR @@ -35,7 +35,9 @@ #include #include -namespace gz::common +#include + +namespace ignition::common { /// \brief Set of flags defined by a C++11 enum class. @@ -371,12 +373,12 @@ struct IsEnumThatContainsSentinel(T::_))> // enumeration contains the sentinel `_`. template std::enable_if_t< - gz::common::IsEnumThatContainsSentinel::value, - gz::common::FlagSet + ignition::common::IsEnumThatContainsSentinel::value, + ignition::common::FlagSet > operator|(const T& _lhs, const T& _rhs) { - gz::common::FlagSet fs; + ignition::common::FlagSet fs; fs |= _lhs; fs |= _rhs; @@ -386,10 +388,10 @@ operator|(const T& _lhs, const T& _rhs) namespace std { template -struct hash> +struct hash> { std::size_t operator()( - const gz::common::FlagSet& _s) + const ignition::common::FlagSet& _s) const noexcept { return _s.Hash(); diff --git a/include/gz/common/MaterialDensity.hh b/include/gz/common/MaterialDensity.hh index 626f2c790..7dfa3f089 100644 --- a/include/gz/common/MaterialDensity.hh +++ b/include/gz/common/MaterialDensity.hh @@ -23,7 +23,7 @@ #include #include "gz/common/Export.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/MovingWindowFilter.hh b/include/gz/common/MovingWindowFilter.hh index 30d8f6af3..83938e495 100644 --- a/include/gz/common/MovingWindowFilter.hh +++ b/include/gz/common/MovingWindowFilter.hh @@ -20,7 +20,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/Plugin.hh b/include/gz/common/Plugin.hh index 578f88ba9..4c93e13fe 100644 --- a/include/gz/common/Plugin.hh +++ b/include/gz/common/Plugin.hh @@ -26,7 +26,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/PluginInfo.hh b/include/gz/common/PluginInfo.hh index cf19f5b12..4ae4941b6 100644 --- a/include/gz/common/PluginInfo.hh +++ b/include/gz/common/PluginInfo.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/PluginLoader.hh b/include/gz/common/PluginLoader.hh index 3132d137e..a80a39d5a 100644 --- a/include/gz/common/PluginLoader.hh +++ b/include/gz/common/PluginLoader.hh @@ -28,7 +28,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/PluginPtr.hh b/include/gz/common/PluginPtr.hh index db4820760..0cc07abda 100644 --- a/include/gz/common/PluginPtr.hh +++ b/include/gz/common/PluginPtr.hh @@ -25,7 +25,7 @@ #include "gz/common/Plugin.hh" -namespace gz +namespace ignition { namespace common { @@ -34,7 +34,7 @@ namespace gz namespace detail { template class ComposePlugin; } /// \brief This class manages the lifecycle of a plugin instance. It can - /// receive a plugin instance from the gz::common::PluginLoader class + /// receive a plugin instance from the ignition::common::PluginLoader class /// or by copy-construction or assignment from another PluginPtr instance. /// /// This class behaves similarly to a std::shared_ptr where multiple diff --git a/include/gz/common/SignalHandler.hh b/include/gz/common/SignalHandler.hh index eb09993c9..a8476de44 100644 --- a/include/gz/common/SignalHandler.hh +++ b/include/gz/common/SignalHandler.hh @@ -21,7 +21,7 @@ #include -namespace gz +namespace ignition { namespace common { @@ -38,7 +38,7 @@ namespace gz /// Example using a lambda callback: /// /// ~~~ - /// gz::common::SignalHandler handler; + /// ignition::common::SignalHandler handler; /// handler.AddCallback([] (int _sig) /// { /// printf("Signal[%d] received\n", _sig); diff --git a/include/gz/common/SingletonT.hh b/include/gz/common/SingletonT.hh index ecde948d4..c7a556299 100644 --- a/include/gz/common/SingletonT.hh +++ b/include/gz/common/SingletonT.hh @@ -17,7 +17,7 @@ #ifndef GZ_COMMON_SINGLETONT_HH_ #define GZ_COMMON_SINGLETONT_HH_ -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/SpecializedPlugin.hh b/include/gz/common/SpecializedPlugin.hh index 95d2684f6..0469b3587 100644 --- a/include/gz/common/SpecializedPlugin.hh +++ b/include/gz/common/SpecializedPlugin.hh @@ -21,7 +21,7 @@ #include "gz/common/Plugin.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/SpecializedPluginPtr.hh b/include/gz/common/SpecializedPluginPtr.hh index 330936dfe..199c21ba9 100644 --- a/include/gz/common/SpecializedPluginPtr.hh +++ b/include/gz/common/SpecializedPluginPtr.hh @@ -22,7 +22,7 @@ #include "gz/common/PluginPtr.hh" #include "gz/common/SpecializedPlugin.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/StringUtils.hh b/include/gz/common/StringUtils.hh index 9aa5fff98..cf0b601b0 100644 --- a/include/gz/common/StringUtils.hh +++ b/include/gz/common/StringUtils.hh @@ -22,7 +22,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/SuppressWarning.hh b/include/gz/common/SuppressWarning.hh index 344d59d59..a270760b3 100644 --- a/include/gz/common/SuppressWarning.hh +++ b/include/gz/common/SuppressWarning.hh @@ -20,6 +20,7 @@ #define GZ_COMMON_SUPPRESSWARNING_HH_ #include +#include // This header contains cross-platform macros for suppressing warnings. Please // only use these macros responsibly when you are certain that the compiler is diff --git a/include/gz/common/SystemPaths.hh b/include/gz/common/SystemPaths.hh index 44e64e325..573e01a72 100644 --- a/include/gz/common/SystemPaths.hh +++ b/include/gz/common/SystemPaths.hh @@ -37,7 +37,7 @@ #include #include -namespace gz +namespace ignition { namespace common { @@ -77,7 +77,7 @@ namespace gz /// \param[in] _uri the uniform resource identifier /// \return Returns full path name to file with platform-specific /// directory separators, or an empty string if URI couldn't be found. - public: std::string FindFileURI(const gz::common::URI &_uri) const; + public: std::string FindFileURI(const ignition::common::URI &_uri) const; /// \brief Set the plugin path environment variable to use /// \param [in] _env name of the environment variable @@ -175,7 +175,7 @@ namespace gz /// \param[in] _cb The callback function, which takes a file path or URI /// and returns the full local path. public: void AddFindFileURICallback( - std::function _cb); + std::function _cb); /// \brief Set the callback to use when ignition can't find a file uri. /// The callback should return a complete path to the requested file, or diff --git a/include/gz/common/TemplateHelpers.hh b/include/gz/common/TemplateHelpers.hh index 74f926c1d..f85d44d88 100644 --- a/include/gz/common/TemplateHelpers.hh +++ b/include/gz/common/TemplateHelpers.hh @@ -22,7 +22,7 @@ #include "gz/common/detail/TemplateHelpers.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/Time.hh b/include/gz/common/Time.hh index 20e877566..1bc4cf1dc 100644 --- a/include/gz/common/Time.hh +++ b/include/gz/common/Time.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { @@ -259,7 +259,7 @@ namespace gz /// \param[in] _time time to write to the stream /// \return the output stream public: friend std::ostream &operator<<(std::ostream &_out, - const gz::common::Time &_time) + const ignition::common::Time &_time) { _out << _time.sec << " " << _time.nsec; return _out; @@ -270,7 +270,7 @@ namespace gz /// \param[in] _time time to read from to the stream /// \return the input stream public: friend std::istream &operator>>(std::istream &_in, - gz::common::Time &_time) + ignition::common::Time &_time) { // Skip white spaces _in.setf(std::ios_base::skipws); diff --git a/include/gz/common/Timer.hh b/include/gz/common/Timer.hh index 0f15efddb..7dbe5a938 100644 --- a/include/gz/common/Timer.hh +++ b/include/gz/common/Timer.hh @@ -20,7 +20,7 @@ #include #include -namespace gz +namespace ignition { namespace common { @@ -50,7 +50,7 @@ namespace gz /// \brief Stream operator friendly public: friend std::ostream &operator<<(std::ostream &out, - const gz::common::Timer &t) + const ignition::common::Timer &t) { out << t.Elapsed(); return out; diff --git a/include/gz/common/URI.hh b/include/gz/common/URI.hh index 296a965f0..e771c5c2b 100644 --- a/include/gz/common/URI.hh +++ b/include/gz/common/URI.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/Util.hh b/include/gz/common/Util.hh index 4f1498cfd..f6055b6b1 100644 --- a/include/gz/common/Util.hh +++ b/include/gz/common/Util.hh @@ -97,7 +97,7 @@ #define IGN_ASSERT(_expr, _msg) assert((_msg, _expr)) /// \brief Forward declarations for the common classes -namespace gz +namespace ignition { namespace common { @@ -322,13 +322,13 @@ namespace gz /////////////////////////////////////////////// // Implementation of get_sha1 template -std::string gz::common::sha1(const T &_buffer) +std::string ignition::common::sha1(const T &_buffer) { if (_buffer.size() == 0) - return gz::common::sha1(NULL, 0); + return ignition::common::sha1(NULL, 0); else { - return gz::common::sha1( + return ignition::common::sha1( &(_buffer[0]), _buffer.size() * sizeof(_buffer[0])); } } diff --git a/include/gz/common/Uuid.hh b/include/gz/common/Uuid.hh index 539ade220..48a648c43 100644 --- a/include/gz/common/Uuid.hh +++ b/include/gz/common/Uuid.hh @@ -32,7 +32,7 @@ using portable_uuid_t = uuid_t; #endif -namespace gz +namespace ignition { namespace common { @@ -53,7 +53,7 @@ namespace gz /// \param[out] _out The output stream. /// \param[in] _msg AdvMsg to write to the stream. public: friend std::ostream &operator<<(std::ostream &_out, - const gz::common::Uuid &_uuid) + const ignition::common::Uuid &_uuid) { _out << _uuid.String(); return _out; diff --git a/include/gz/common/WorkerPool.hh b/include/gz/common/WorkerPool.hh index a0859b36b..00d9949f0 100644 --- a/include/gz/common/WorkerPool.hh +++ b/include/gz/common/WorkerPool.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/config.hh.in b/include/gz/common/config.hh.in index 8c408fde1..14ee66732 100644 --- a/include/gz/common/config.hh.in +++ b/include/gz/common/config.hh.in @@ -11,3 +11,12 @@ #define IGNITION_COMMON_VERSION_HEADER "Ignition common, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #cmakedefine HAVE_AVDEVICE + +namespace ignition +{ +} + +namespace gz +{ + using namespace ignition; +} diff --git a/include/gz/common/detail/Plugin.hh b/include/gz/common/detail/Plugin.hh index bc5a2e1a9..3a8a048c1 100644 --- a/include/gz/common/detail/Plugin.hh +++ b/include/gz/common/detail/Plugin.hh @@ -23,7 +23,7 @@ #include #include "gz/common/Plugin.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/detail/PluginLoader.hh b/include/gz/common/detail/PluginLoader.hh index 6428b2987..2ef11c625 100644 --- a/include/gz/common/detail/PluginLoader.hh +++ b/include/gz/common/detail/PluginLoader.hh @@ -22,7 +22,7 @@ #include #include "gz/common/PluginLoader.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/common/detail/PluginMacros.hh b/include/gz/common/detail/PluginMacros.hh index 796ffa853..cca79731a 100644 --- a/include/gz/common/detail/PluginMacros.hh +++ b/include/gz/common/detail/PluginMacros.hh @@ -51,13 +51,13 @@ #define DETAIL_IGN_COMMON_REGISTER_PLUGININFO_META_DATA \ extern "C" { \ std::size_t DETAIL_IGN_PLUGIN_VISIBLE IGNCOMMONPluginInfoSize = \ - sizeof(gz::common::PluginInfo); \ + sizeof(ignition::common::PluginInfo); \ \ std::size_t DETAIL_IGN_PLUGIN_VISIBLE IGNCOMMONPluginInfoAlignment = \ - alignof(gz::common::PluginInfo); \ + alignof(ignition::common::PluginInfo); \ \ int DETAIL_IGN_PLUGIN_VISIBLE IGNCOMMONPluginAPIVersion = \ - gz::common::PLUGIN_API_VERSION; \ + ignition::common::PLUGIN_API_VERSION; \ } @@ -92,18 +92,18 @@ IGN_COMMON_WARN_IGNORE__DELETE_NON_VIRTUAL_DESTRUCTOR \ const std::size_t _pluginId, \ const std::size_t _size) \ { \ - if (_size != sizeof(gz::common::PluginInfo)) \ + if (_size != sizeof(ignition::common::PluginInfo)) \ { \ return 0u; \ } \ std::unordered_set visitedPlugins; \ - gz::common::PluginInfo * * const ptrToPlugin = \ - reinterpret_cast(_outputInfo); \ + ignition::common::PluginInfo * * const ptrToPlugin = \ + reinterpret_cast(_outputInfo); \ if ( !(*ptrToPlugin) ) \ { \ - *ptrToPlugin = new gz::common::PluginInfo; \ + *ptrToPlugin = new ignition::common::PluginInfo; \ } \ - gz::common::PluginInfo *plugin = *ptrToPlugin; \ + ignition::common::PluginInfo *plugin = *ptrToPlugin; \ plugin->name.clear(); \ plugin->interfaces.clear(); \ plugin->factory = nullptr; \ diff --git a/include/gz/common/detail/PluginPtr.hh b/include/gz/common/detail/PluginPtr.hh index 191bb6f84..93952868e 100644 --- a/include/gz/common/detail/PluginPtr.hh +++ b/include/gz/common/detail/PluginPtr.hh @@ -24,7 +24,7 @@ #include "gz/common/PluginPtr.hh" #include "gz/common/TemplateHelpers.hh" -namespace gz +namespace ignition { namespace common { @@ -185,10 +185,10 @@ namespace std /// so that it can easily be used in STL objects like std::unordered_set and /// std::unordered_map template - struct hash> + struct hash> { size_t operator()( - const gz::common::TemplatePluginPtr &ptr) const + const ignition::common::TemplatePluginPtr &ptr) const { return ptr.Hash(); } diff --git a/include/gz/common/detail/SpecializedPlugin.hh b/include/gz/common/detail/SpecializedPlugin.hh index b613ab2f2..dff284cca 100644 --- a/include/gz/common/detail/SpecializedPlugin.hh +++ b/include/gz/common/detail/SpecializedPlugin.hh @@ -30,7 +30,7 @@ bool usedSpecializedInterfaceAccess; #endif -namespace gz +namespace ignition { namespace common { @@ -253,7 +253,7 @@ namespace gz // Declare friendship - template friend class gz::common::SpecializedPlugin; + template friend class ignition::common::SpecializedPlugin; template friend class ComposePlugin; private: ComposePlugin() = default; diff --git a/include/gz/common/detail/TemplateHelpers.hh b/include/gz/common/detail/TemplateHelpers.hh index 954f53c43..332755ed8 100644 --- a/include/gz/common/detail/TemplateHelpers.hh +++ b/include/gz/common/detail/TemplateHelpers.hh @@ -22,7 +22,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/include/ignition/common/config.hh b/include/ignition/common/config.hh index 40f575e96..402178e9a 100644 --- a/include/ignition/common/config.hh +++ b/include/ignition/common/config.hh @@ -32,13 +32,13 @@ /* #undef HAVE_AVDEVICE */ -namespace gz +namespace ignition { } -namespace ignition +namespace gz { - using namespace gz; + using namespace ignition; } #endif diff --git a/profiler/include/gz/common/Profiler.hh b/profiler/include/gz/common/Profiler.hh index a765e1af7..ef218f83f 100644 --- a/profiler/include/gz/common/Profiler.hh +++ b/profiler/include/gz/common/Profiler.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { @@ -130,16 +130,16 @@ namespace gz #if IGN_PROFILER_ENABLE /// \brief Set name of profiled thread #define IGN_PROFILE_THREAD_NAME(name) \ - gz::common::Profiler::Instance()->SetThreadName(name); + ignition::common::Profiler::Instance()->SetThreadName(name); /// \brief Log profiling text, if supported by implementation #define IGN_PROFILE_LOG_TEXT(name) \ - gz::common::Profiler::Instance()->LogText(name); + ignition::common::Profiler::Instance()->LogText(name); /// \brief Being profiling sample #define IGN_PROFILE_BEGIN(name) \ - gz::common::Profiler::Instance()->BeginSample(name) + ignition::common::Profiler::Instance()->BeginSample(name) /// \brief End profiling sample #define IGN_PROFILE_END() \ - gz::common::Profiler::Instance()->EndSample() + ignition::common::Profiler::Instance()->EndSample() /// \brief Convenience wrapper for scoped profiling sample. Use IGN_PROFILE #define IGN_PROFILE_L(name, line) \ @@ -160,6 +160,6 @@ gz::common::ScopedProfile __profile##line(name, &__hash##line); /// \brief Macro to determine if profiler is enabled and has an implementation. #define IGN_PROFILER_VALID \ - IGN_PROFILER_ENABLE && gz::common::Profiler::Instance()->Valid() + IGN_PROFILER_ENABLE && ignition::common::Profiler::Instance()->Valid() #endif // GZ_COMMON_PROFILER_HH_ diff --git a/profiler/src/Profiler.cc b/profiler/src/Profiler.cc index b1b22138c..8d6e13b6b 100644 --- a/profiler/src/Profiler.cc +++ b/profiler/src/Profiler.cc @@ -23,7 +23,7 @@ #include "RemoteryProfilerImpl.hh" #endif // IGN_PROFILER_REMOTERY -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/profiler/src/ProfilerImpl.hh b/profiler/src/ProfilerImpl.hh index 1df029342..82d3ddad2 100644 --- a/profiler/src/ProfilerImpl.hh +++ b/profiler/src/ProfilerImpl.hh @@ -20,7 +20,7 @@ #include -namespace gz +namespace ignition { namespace common { diff --git a/profiler/src/Profiler_Disabled_TEST.cc b/profiler/src/Profiler_Disabled_TEST.cc index c28733593..3e4a17c50 100644 --- a/profiler/src/Profiler_Disabled_TEST.cc +++ b/profiler/src/Profiler_Disabled_TEST.cc @@ -23,7 +23,7 @@ #include "gz/common/Util.hh" // NOLINT(*) #include "gz/common/Time.hh" // NOLINT(*) -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/profiler/src/Profiler_Remotery_TEST.cc b/profiler/src/Profiler_Remotery_TEST.cc index a7da75d1b..1181d6016 100644 --- a/profiler/src/Profiler_Remotery_TEST.cc +++ b/profiler/src/Profiler_Remotery_TEST.cc @@ -23,7 +23,7 @@ #include "gz/common/Util.hh" // NOLINT(*) #include "gz/common/Time.hh" // NOLINT(*) -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/profiler/src/RemoteryProfilerImpl.cc b/profiler/src/RemoteryProfilerImpl.cc index d7e1ba0cf..bf3970ae9 100644 --- a/profiler/src/RemoteryProfilerImpl.cc +++ b/profiler/src/RemoteryProfilerImpl.cc @@ -21,7 +21,7 @@ #include "gz/common/Console.hh" #include "gz/common/Util.hh" -using namespace gz; +using namespace ignition; using namespace common; std::string rmtErrorToString(rmtError error) { diff --git a/profiler/src/RemoteryProfilerImpl.hh b/profiler/src/RemoteryProfilerImpl.hh index ab1aaa6a4..90acd261f 100644 --- a/profiler/src/RemoteryProfilerImpl.hh +++ b/profiler/src/RemoteryProfilerImpl.hh @@ -25,7 +25,7 @@ #include "ProfilerImpl.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/Base64.cc b/src/Base64.cc index c3bcc622d..5bc748d73 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -44,7 +44,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; static const char base64Chars[] = diff --git a/src/Base64_TEST.cc b/src/Base64_TEST.cc index 5c1141c01..13abcfc72 100644 --- a/src/Base64_TEST.cc +++ b/src/Base64_TEST.cc @@ -20,7 +20,7 @@ #include "test_config.h" -using namespace gz; +using namespace ignition; class Base64 : public common::testing::AutoLogFixture { }; diff --git a/src/Battery.cc b/src/Battery.cc index 51e4fbcf2..336f98e4a 100644 --- a/src/Battery.cc +++ b/src/Battery.cc @@ -20,7 +20,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; /// \brief Private data for the Battery class diff --git a/src/Battery_TEST.cc b/src/Battery_TEST.cc index 150024c00..43607c6f6 100644 --- a/src/Battery_TEST.cc +++ b/src/Battery_TEST.cc @@ -18,7 +18,7 @@ #include "gz/common/Battery.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; class BatteryTest : public common::testing::AutoLogFixture { }; diff --git a/src/Console.cc b/src/Console.cc index 4bac3b1fe..d6604448e 100644 --- a/src/Console.cc +++ b/src/Console.cc @@ -25,7 +25,7 @@ #include #endif -using namespace gz; +using namespace ignition; using namespace common; diff --git a/src/Console_TEST.cc b/src/Console_TEST.cc index 9ed99a3fe..bb4c837c1 100644 --- a/src/Console_TEST.cc +++ b/src/Console_TEST.cc @@ -25,8 +25,8 @@ #include "test_config.h" -using namespace gz; -using namespace gz::common; +using namespace ignition; +using namespace ignition::common; const int g_messageRepeat = 4; diff --git a/src/EnumIface_TEST.cc b/src/EnumIface_TEST.cc index 666e4ef90..69a70b77b 100644 --- a/src/EnumIface_TEST.cc +++ b/src/EnumIface_TEST.cc @@ -20,7 +20,7 @@ #include "gz/common/EnumIface.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; class EnumIfaceTest : public common::testing::AutoLogFixture { }; diff --git a/src/Filesystem.cc b/src/Filesystem.cc index 4fb05db25..b363ad91e 100644 --- a/src/Filesystem.cc +++ b/src/Filesystem.cc @@ -61,7 +61,7 @@ #endif namespace igncmn = gz::common; -using namespace gz; +using namespace ignition; using namespace igncmn; ///////////////////////////////////////////////// diff --git a/src/FilesystemBoost.cc b/src/FilesystemBoost.cc index afd3ea249..ea1ed04bd 100644 --- a/src/FilesystemBoost.cc +++ b/src/FilesystemBoost.cc @@ -58,7 +58,7 @@ #include "gz/common/Console.hh" #include "gz/common/Filesystem.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc index e09ec5a9b..dd5c63f54 100644 --- a/src/Filesystem_TEST.cc +++ b/src/Filesystem_TEST.cc @@ -213,7 +213,7 @@ bool create_new_file_hardlink(const std::string &_hardlink, #include "gz/common/Console.hh" #include "gz/common/Filesystem.hh" -using namespace gz; +using namespace ignition; using namespace common; /// \brief Test Filesystem diff --git a/src/FlagSet_TEST.cc b/src/FlagSet_TEST.cc index 0ef213995..57911455e 100644 --- a/src/FlagSet_TEST.cc +++ b/src/FlagSet_TEST.cc @@ -181,7 +181,7 @@ TEST(FlagSet, TestAnyAllNone) TEST(FlagSet, TestConstructors) { - using namespace gz::common; + using namespace ignition::common; ASSERT_EQ(5u, FlagSet::numElements); @@ -216,7 +216,7 @@ TEST(FlagSet, TestStaticConstructors) TEST(FlagSet, TestHash) { - using namespace gz::common; + using namespace ignition::common; const auto options1 = FlagSet::AllSet(); const auto options2 = FlagSet::NoneSet(); @@ -366,7 +366,7 @@ TEST(FlagSet, TestUnderlyingTypes) _ }; - using namespace gz::common; + using namespace ignition::common; EXPECT_TRUE(FlagSet(CharEnum::A).All()); EXPECT_TRUE(FlagSet(UCharEnum::A).All()); diff --git a/src/MaterialDensity.cc b/src/MaterialDensity.cc index e899103f6..90ce9a57f 100644 --- a/src/MaterialDensity.cc +++ b/src/MaterialDensity.cc @@ -19,7 +19,7 @@ #include "gz/common/EnumIface.hh" #include "gz/common/MaterialDensity.hh" -using namespace gz; +using namespace ignition; using namespace common; // Initialize enum iterator, and string converter diff --git a/src/MaterialDensity_TEST.cc b/src/MaterialDensity_TEST.cc index ffdcf0adb..0e3cad0c9 100644 --- a/src/MaterialDensity_TEST.cc +++ b/src/MaterialDensity_TEST.cc @@ -19,7 +19,7 @@ #include "gz/common/MaterialDensity.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; using namespace common; class MaterialDensityTest : public common::testing::AutoLogFixture { }; diff --git a/src/MovingWindowFilter_TEST.cc b/src/MovingWindowFilter_TEST.cc index de8aad123..a9c998e80 100644 --- a/src/MovingWindowFilter_TEST.cc +++ b/src/MovingWindowFilter_TEST.cc @@ -20,7 +20,7 @@ #include "gz/common/MovingWindowFilter.hh" -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// TEST(MovingWindowFilterTest, SetWindowSize) diff --git a/src/Plugin.cc b/src/Plugin.cc index 83488bade..fcf07b2c6 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -21,7 +21,7 @@ #include "gz/common/Console.hh" #include "PluginUtils.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/PluginLoader.cc b/src/PluginLoader.cc index 3bd05d4e6..c220c0949 100644 --- a/src/PluginLoader.cc +++ b/src/PluginLoader.cc @@ -32,7 +32,7 @@ #include "PluginUtils.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/PluginUtils.hh b/src/PluginUtils.hh index 83f7c8a3b..9dfc9dca4 100644 --- a/src/PluginUtils.hh +++ b/src/PluginUtils.hh @@ -21,7 +21,7 @@ #include #include "gz/common/StringUtils.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/PluginUtils_TEST.cc b/src/PluginUtils_TEST.cc index 02b50b211..0e8f7a7e1 100644 --- a/src/PluginUtils_TEST.cc +++ b/src/PluginUtils_TEST.cc @@ -19,7 +19,7 @@ #include "PluginUtils.hh" -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// TEST(PluginUtils, NormalizeName) diff --git a/src/PrintWindowsSystemWarning.hh b/src/PrintWindowsSystemWarning.hh index e29302b80..e53fb38cd 100644 --- a/src/PrintWindowsSystemWarning.hh +++ b/src/PrintWindowsSystemWarning.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace common { diff --git a/src/SignalHandler.cc b/src/SignalHandler.cc index a302cb6c6..0be795500 100644 --- a/src/SignalHandler.cc +++ b/src/SignalHandler.cc @@ -26,7 +26,7 @@ #include // NOLINT(*) #include "gz/common/Console.hh" // NOLINT(*) -using namespace gz; +using namespace ignition; using namespace common; // A wrapper for the sigaction sa_handler. diff --git a/src/SignalHandler_TEST.cc b/src/SignalHandler_TEST.cc index 90bbd27a5..3f624e496 100644 --- a/src/SignalHandler_TEST.cc +++ b/src/SignalHandler_TEST.cc @@ -26,7 +26,7 @@ #include // NOLINT(*) #include "gz/common/Util.hh" // NOLINT(*) -using namespace gz; +using namespace ignition; // Capture the gOnSignalWrappers map from SignalHandlers.cc #ifndef _WIN32 diff --git a/src/StringUtils.cc b/src/StringUtils.cc index be180f99a..072684beb 100644 --- a/src/StringUtils.cc +++ b/src/StringUtils.cc @@ -18,7 +18,7 @@ #include #include "gz/common/StringUtils.hh" -namespace gz +namespace ignition { namespace common { diff --git a/src/StringUtils_TEST.cc b/src/StringUtils_TEST.cc index bddba774e..0b5d0c3b1 100644 --- a/src/StringUtils_TEST.cc +++ b/src/StringUtils_TEST.cc @@ -21,7 +21,7 @@ #include "gz/common/StringUtils.hh" -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// TEST(StringUtils, SplitNoDelimiterPresent) diff --git a/src/SystemPaths.cc b/src/SystemPaths.cc index 79ab6c16c..f9e970f3e 100644 --- a/src/SystemPaths.cc +++ b/src/SystemPaths.cc @@ -36,7 +36,7 @@ #include "gz/common/SystemPaths.hh" #include "gz/common/Util.hh" -using namespace gz; +using namespace ignition; using namespace common; // Private data class diff --git a/src/SystemPaths_TEST.cc b/src/SystemPaths_TEST.cc index 4c105c432..0711606b0 100644 --- a/src/SystemPaths_TEST.cc +++ b/src/SystemPaths_TEST.cc @@ -31,7 +31,7 @@ #define snprintf _snprintf #endif -using namespace gz; +using namespace ignition; const char kPluginPath[] = "IGN_PLUGIN_PATH"; const char kFilePath[] = "IGN_FILE_PATH"; diff --git a/src/TemplateHelpers_TEST.cc b/src/TemplateHelpers_TEST.cc index bd5638447..b2a8f694c 100644 --- a/src/TemplateHelpers_TEST.cc +++ b/src/TemplateHelpers_TEST.cc @@ -37,7 +37,7 @@ TEST(TemplateHelpers, ConstCompatible) // The extra pair of parentheses are so the comma between the template // arguments don't confuse the macro. - using namespace gz::common; + using namespace ignition::common; EXPECT_TRUE((ConstCompatible::value)); EXPECT_FALSE((ConstCompatible::value)); EXPECT_TRUE((ConstCompatible::value)); diff --git a/src/Time.cc b/src/Time.cc index 6b98d642d..a472b24e7 100644 --- a/src/Time.cc +++ b/src/Time.cc @@ -56,7 +56,7 @@ #include #include -using namespace gz; +using namespace ignition; using namespace common; Time Time::wallTime; diff --git a/src/Time_TEST.cc b/src/Time_TEST.cc index 651367011..b0fb8e874 100644 --- a/src/Time_TEST.cc +++ b/src/Time_TEST.cc @@ -20,7 +20,7 @@ #include #include -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// TEST(TimeTest, Time) diff --git a/src/Timer.cc b/src/Timer.cc index da1ccaed8..4b882c24b 100644 --- a/src/Timer.cc +++ b/src/Timer.cc @@ -17,7 +17,7 @@ #include -using namespace gz; +using namespace ignition; using namespace common; ////////////////////////////////////////////////// diff --git a/src/URI.cc b/src/URI.cc index bb23c9b71..9b32cd02d 100644 --- a/src/URI.cc +++ b/src/URI.cc @@ -25,7 +25,7 @@ #include "gz/common/Console.hh" #include "gz/common/URI.hh" -using namespace gz; +using namespace ignition; using namespace common; static const char kSchemeDelim[] = "://"; diff --git a/src/URI_TEST.cc b/src/URI_TEST.cc index f7b61103b..8fcf1629a 100644 --- a/src/URI_TEST.cc +++ b/src/URI_TEST.cc @@ -18,7 +18,7 @@ #include #include "gz/common/URI.hh" -using namespace gz; +using namespace ignition; using namespace common; ///////////////////////////////////////////////// diff --git a/src/Util_TEST.cc b/src/Util_TEST.cc index 2d1e11ee9..5059bf960 100644 --- a/src/Util_TEST.cc +++ b/src/Util_TEST.cc @@ -22,7 +22,7 @@ #include #include "test_config.h" -using namespace gz; +using namespace ignition; ///////////////////////////////////////////////// /// \brief Test Util::SHA1 diff --git a/src/Uuid.cc b/src/Uuid.cc index 9cce7d86e..712654fee 100644 --- a/src/Uuid.cc +++ b/src/Uuid.cc @@ -20,7 +20,7 @@ #include "gz/common/Uuid.hh" -using namespace gz; +using namespace ignition; using namespace common; #ifdef _WIN32 diff --git a/src/Uuid_TEST.cc b/src/Uuid_TEST.cc index 0119986be..3d43e38af 100644 --- a/src/Uuid_TEST.cc +++ b/src/Uuid_TEST.cc @@ -22,7 +22,7 @@ #include "gz/common/Uuid.hh" #include "gtest/gtest.h" -using namespace gz; +using namespace ignition; ////////////////////////////////////////////////// /// \brief Check the Uuid helper class. diff --git a/src/WorkerPool.cc b/src/WorkerPool.cc index 1f828f382..b4350b34d 100644 --- a/src/WorkerPool.cc +++ b/src/WorkerPool.cc @@ -25,7 +25,7 @@ namespace igncmn = gz::common; using namespace igncmn; -namespace gz +namespace ignition { namespace common { diff --git a/test/integration/console.cc b/test/integration/console.cc index e65a5372f..abc73df97 100644 --- a/test/integration/console.cc +++ b/test/integration/console.cc @@ -20,7 +20,7 @@ #include "gz/common/Console.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; TEST(Console_TEST, LogInitAfterConsoleOut) { diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc index 3919c1698..2c62a4616 100644 --- a/test/integration/deprecated_TEST.cc +++ b/test/integration/deprecated_TEST.cc @@ -22,5 +22,5 @@ // Make sure the ignition namespace still works TEST(Deprecated, IgnitionNamespace) { - ignition::common::Battery battery; + gz::common::Battery battery; } diff --git a/test/integration/encoder_timing.cc b/test/integration/encoder_timing.cc index d15874703..365ff8478 100644 --- a/test/integration/encoder_timing.cc +++ b/test/integration/encoder_timing.cc @@ -19,7 +19,7 @@ #include "gz/common/Video.hh" #include "test_config.h" -using namespace gz; +using namespace ignition; using namespace common; const unsigned int kSize = 10; diff --git a/test/integration/mesh.cc b/test/integration/mesh.cc index 99d7be46a..b99d64431 100644 --- a/test/integration/mesh.cc +++ b/test/integration/mesh.cc @@ -27,7 +27,7 @@ #include "gz/common/SystemPaths.hh" #include "gz/math/Vector3.hh" -using namespace gz; +using namespace ignition; using TestFile = common::testing::TestFile; class MeshTest : public common::testing::AutoLogFixture { }; diff --git a/test/integration/video_encoder.cc b/test/integration/video_encoder.cc index 70c622924..278b6ed59 100644 --- a/test/integration/video_encoder.cc +++ b/test/integration/video_encoder.cc @@ -24,7 +24,7 @@ #include "test_config.h" -using namespace gz; +using namespace ignition; using namespace common; using namespace std::chrono; auto Now = steady_clock::now; diff --git a/test/test_config.h.in b/test/test_config.h.in index c76618c09..60daf0215 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -18,7 +18,7 @@ #define PROJECT_BINARY_PATH "${PROJECT_BINARY_DIR}" #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}" -namespace gz +namespace ignition { namespace common { @@ -77,14 +77,14 @@ namespace gz { if (common::env("TEST_UNDECLARED_OUTPUTS_DIR", _homeDir)) { - return gz::common::setenv(IGN_HOMEDIR, _homeDir); + return ignition::common::setenv(IGN_HOMEDIR, _homeDir); } else { if (TestTmpPath(_homeDir)) { // Set both for linux and windows - return gz::common::setenv(IGN_HOMEDIR, _homeDir); + return ignition::common::setenv(IGN_HOMEDIR, _homeDir); } else { @@ -149,7 +149,7 @@ namespace gz ignLogInit(common::joinPaths(this->logBasePath, "test_logs"), this->logFilename); - gz::common::Console::SetVerbosity(4); + ignition::common::Console::SetVerbosity(4); // Read the full path to the log directory. this->logDirectory = ignLogDirectory(); @@ -159,7 +159,7 @@ namespace gz /// \return The full log file path as a string. protected: std::string FullLogPath() const { - return gz::common::joinPaths( + return ignition::common::joinPaths( this->logDirectory, this->logFilename); } @@ -184,7 +184,7 @@ namespace gz public: virtual ~AutoLogFixture() { ignLogClose(); - gz::common::removeAll(this->logBasePath); + ignition::common::removeAll(this->logBasePath); } /// \brief String with the full path of the logfile @@ -198,7 +198,7 @@ namespace gz }; } // namespace testing } // namespace common -} // namespace gz +} // namespace ignition