Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <[email protected]>
gazebosim · Sep 5, 2022 · 655698d · 655698d
1 parent a8b31e9
commit 655698d
Show file tree

Hide file tree

Showing 180 changed files with 292 additions and 295 deletions.
diff --git a/examples/custom_scene_viewer/ManualSceneDemo.hh b/examples/custom_scene_viewer/ManualSceneDemo.hh
@@ -21,7 +21,7 @@
 #include <gz/rendering.hh>
 #include "TestTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/custom_scene_viewer/SceneBuilder.hh b/examples/custom_scene_viewer/SceneBuilder.hh
@@ -20,7 +20,7 @@
 #include <string>
 #include "TestTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/custom_scene_viewer/TestTypes.hh b/examples/custom_scene_viewer/TestTypes.hh
@@ -20,7 +20,7 @@
 #include <vector>
 #include <gz/rendering.hh>
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/gazebo_scene_viewer/CameraWindow.hh b/examples/gazebo_scene_viewer/CameraWindow.hh
@@ -20,8 +20,6 @@
 #include <vector>
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz = gz::rendering;
-
 void GlutRun(std::vector<gz::CameraPtr> _cameras);
 
 void GlutDisplay();

diff --git a/examples/gazebo_scene_viewer/GazeboDemo.cc b/examples/gazebo_scene_viewer/GazeboDemo.cc
@@ -28,9 +28,9 @@ using namespace rendering;
 
 void Connect()
 {
-  sim::common::Console::SetQuiet(false);
-  sim::transport::init();
-  sim::transport::run();
+  gazebo::common::Console::SetQuiet(false);
+  gazebo::transport::init();
+  gazebo::transport::run();
 
   SceneManager* manager = SceneManager::Instance();
   manager->Load();

diff --git a/examples/gazebo_scene_viewer/GazeboWorldDemo.cc b/examples/gazebo_scene_viewer/GazeboWorldDemo.cc
@@ -29,8 +29,8 @@ using namespace rendering;
 void Connect()
 {
   common::Console::SetVerbosity(4);
-  sim::transport::init();
-  sim::transport::run();
+  gazebo::transport::init();
+  gazebo::transport::run();
 
   SceneManager* manager = SceneManager::Instance();
   manager->Load();