Convert remaining #include statements to use gz/ (#59)

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · May 14, 2022 · fbec80f · fbec80f
1 parent b802e60
commit fbec80f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/cli/src/cli_TEST.cc b/cli/src/cli_TEST.cc
@@ -19,8 +19,8 @@
 
 #include <memory>
 
-#include <ignition/utils/cli/CLI.hpp>
-#include <ignition/utils/cli/IgnitionFormatter.hpp>
+#include <gz/utils/cli/CLI.hpp>
+#include <gz/utils/cli/GzFormatter.hpp>
 
 /////////////////////////////////////////////////
 struct TestOptions

diff --git a/src/Environment.cc b/src/Environment.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <ignition/utils/Environment.hh>
+#include <gz/utils/Environment.hh>
 
 #include <cstdlib>
 #include <iostream>

diff --git a/src/Environment_TEST.cc b/src/Environment_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/utils/Environment.hh>
+#include <gz/utils/Environment.hh>
 
 using namespace ignition;
 

diff --git a/src/NeverDestroyed_TEST.cc b/src/NeverDestroyed_TEST.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include "ignition/utils/NeverDestroyed.hh"
+#include "gz/utils/NeverDestroyed.hh"
 
 #include <gtest/gtest.h>
 

diff --git a/test/integration/implptr/ImplPtr_TEST.cc b/test/integration/implptr/ImplPtr_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/utils/ImplPtr.hh>
 #include "implptr_test_classes.hh"
 
 using namespace ignition::implptr_test_classes;

diff --git a/test/integration/implptr/implptr_test_classes.hh b/test/integration/implptr/implptr_test_classes.hh
@@ -18,8 +18,8 @@
 #ifndef IGNITION_UTILS_TEST_IMPLPTR_TEST_CLASSES_HH_
 #define IGNITION_UTILS_TEST_IMPLPTR_TEST_CLASSES_HH_
 
-#include <ignition/utils/ImplPtr.hh>
-#include <ignition/utils/Export.hh>
+#include <gz/utils/ImplPtr.hh>
+#include <gz/utils/Export.hh>
 
 #include <functional>
 #include <string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      *
      */
-    #include "ignition/utils/NeverDestroyed.hh"
+    #include "gz/utils/NeverDestroyed.hh"
     #include <gtest/gtest.h>
@@ Expand Down @@