Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Sep 5, 2022 · d97d94a · d97d94a
1 parent f46f625
commit d97d94a
Show file tree

Hide file tree

Showing 109 changed files with 147 additions and 148 deletions.
diff --git a/example/bench.cc b/example/bench.cc
@@ -48,7 +48,7 @@
 #include <thread>
 #include <mutex>
 #include <vector>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 DEFINE_bool(h, false, "Show help");

diff --git a/example/publisher.cc b/example/publisher.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <string>
 #include <thread>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 /// \brief Flag used to break the publisher loop and terminate the program.

diff --git a/example/publisher_raw.cc b/example/publisher_raw.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <string>
 #include <thread>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 /// \brief Flag used to break the publisher loop and terminate the program.

diff --git a/example/requester.cc b/example/requester.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/requester_async.cc b/example/requester_async.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/requester_async_no_input.cc b/example/requester_async_no_input.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/requester_no_input.cc b/example/requester_no_input.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/requester_oneway.cc b/example/requester_oneway.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/responser.cc b/example/responser.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/responser_no_input.cc b/example/responser_no_input.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/responser_oneway.cc b/example/responser_oneway.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/subscriber.cc b/example/subscriber.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/subscriber_raw.cc b/example/subscriber_raw.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 //////////////////////////////////////////////////

diff --git a/example/subscriber_stats.cc b/example/subscriber_stats.cc
@@ -17,7 +17,7 @@
 
 #include <iostream>
 #include <string>
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #include <gz/transport.hh>
 
 

diff --git a/include/gz/transport/AdvertiseOptions.hh b/include/gz/transport/AdvertiseOptions.hh
@@ -25,7 +25,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Clock.hh b/include/gz/transport/Clock.hh
@@ -26,7 +26,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Discovery.hh b/include/gz/transport/Discovery.hh
@@ -78,7 +78,7 @@
 #include "gz/transport/TopicStorage.hh"
 #include "gz/transport/TransportTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/HandlerStorage.hh b/include/gz/transport/HandlerStorage.hh
@@ -26,7 +26,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/TransportTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Helpers.hh b/include/gz/transport/Helpers.hh
@@ -43,7 +43,7 @@
   #endif
 #endif
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/MessageInfo.hh b/include/gz/transport/MessageInfo.hh
@@ -24,7 +24,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/NetUtils.hh b/include/gz/transport/NetUtils.hh
@@ -24,7 +24,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Node.hh b/include/gz/transport/Node.hh
@@ -30,7 +30,7 @@
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -49,7 +49,7 @@
 #include "gz/transport/TopicUtils.hh"
 #include "gz/transport/TransportTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/NodeOptions.hh b/include/gz/transport/NodeOptions.hh
@@ -24,7 +24,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/NodeShared.hh b/include/gz/transport/NodeShared.hh
@@ -46,7 +46,7 @@
 #include "gz/transport/TransportTypes.hh"
 #include "gz/transport/Uuid.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Packet.hh b/include/gz/transport/Packet.hh
@@ -30,7 +30,7 @@
 // This whole file is deprecated in version 8 of Ignition Transport. Please
 // remove this file in Version 9.
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Publisher.hh b/include/gz/transport/Publisher.hh
@@ -27,7 +27,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/RepHandler.hh b/include/gz/transport/RepHandler.hh
@@ -40,7 +40,7 @@
 #include "gz/transport/TransportTypes.hh"
 #include "gz/transport/Uuid.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/ReqHandler.hh b/include/gz/transport/ReqHandler.hh
@@ -36,7 +36,7 @@
 #include "gz/transport/TransportTypes.hh"
 #include "gz/transport/Uuid.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/SubscribeOptions.hh b/include/gz/transport/SubscribeOptions.hh
@@ -24,7 +24,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/SubscriptionHandler.hh b/include/gz/transport/SubscriptionHandler.hh
@@ -47,7 +47,7 @@
 #include "gz/transport/TransportTypes.hh"
 #include "gz/transport/Uuid.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/TopicStatistics.hh b/include/gz/transport/TopicStatistics.hh
@@ -25,7 +25,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/TopicStorage.hh b/include/gz/transport/TopicStorage.hh
@@ -28,7 +28,7 @@
 #include "gz/transport/Publisher.hh"
 #include "gz/transport/TransportTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/TopicUtils.hh b/include/gz/transport/TopicUtils.hh
@@ -24,7 +24,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/TransportTypes.hh b/include/gz/transport/TransportTypes.hh
@@ -35,7 +35,7 @@
 #include "gz/transport/config.hh"
 #include "gz/transport/Publisher.hh"
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/Uuid.hh b/include/gz/transport/Uuid.hh
@@ -33,7 +33,7 @@
   using portable_uuid_t = uuid_t;
 #endif
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/gz/transport/config.hh.in b/include/gz/transport/config.hh.in
@@ -22,4 +22,13 @@
 #cmakedefine HAVE_IFADDRS 1
 #cmakedefine UBUNTU_FOCAL 1
 
+namespace ignition
+{
+}
+
+namespace gz
+{
+  using namespace ignition;
+}
+
 #endif
diff --git a/include/gz/transport/detail/Node.hh b/include/gz/transport/detail/Node.hh
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/include/ignition/transport/config.hh b/include/ignition/transport/config.hh
@@ -39,14 +39,4 @@
 // #define HAVE_IFADDRS 1
 /* #undef UBUNTU_FOCAL */
 
-namespace gz
-{
-}
-
-namespace ignition
-{
-  using namespace gz;
-}
-
-
 #endif
diff --git a/log/include/gz/transport/log/Batch.hh b/log/include/gz/transport/log/Batch.hh
@@ -24,7 +24,7 @@
 #include <gz/transport/log/Export.hh>
 #include <gz/transport/log/MsgIter.hh>
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/log/include/gz/transport/log/Descriptor.hh b/log/include/gz/transport/log/Descriptor.hh
@@ -26,7 +26,7 @@
 #include <gz/transport/config.hh>
 #include <gz/transport/log/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/log/include/gz/transport/log/Log.hh b/log/include/gz/transport/log/Log.hh
@@ -29,7 +29,7 @@
 #include <gz/transport/log/Descriptor.hh>
 #include <gz/transport/log/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {

diff --git a/log/include/gz/transport/log/Message.hh b/log/include/gz/transport/log/Message.hh
@@ -24,7 +24,7 @@
 #include <gz/transport/config.hh>
 #include <gz/transport/log/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace transport
   {