From 6ae59e640af8de6356c077120c5a9df2a9f9a6dc Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 26 Aug 2022 13:17:04 -0700 Subject: [PATCH] Leave ignition as primary in headers to fix ABI Signed-off-by: methylDragon --- example/bench.cc | 2 +- example/publisher.cc | 2 +- example/publisher_c.cc | 2 +- example/publisher_c_fast.cc | 2 +- example/publisher_raw.cc | 2 +- example/requester.cc | 2 +- example/requester_async.cc | 2 +- example/requester_async_no_input.cc | 2 +- example/requester_no_input.cc | 2 +- example/requester_oneway.cc | 2 +- example/responser.cc | 2 +- example/responser_no_input.cc | 2 +- example/responser_oneway.cc | 2 +- example/subscriber.cc | 2 +- example/subscriber_c.cc | 2 +- example/subscriber_c_slow.cc | 2 +- example/subscriber_raw.cc | 2 +- example/subscriber_stats.cc | 2 +- include/gz/transport/AdvertiseOptions.hh | 2 +- include/gz/transport/Clock.hh | 2 +- include/gz/transport/Discovery.hh | 6 +++--- include/gz/transport/HandlerStorage.hh | 2 +- include/gz/transport/Helpers.hh | 2 +- include/gz/transport/MessageInfo.hh | 2 +- include/gz/transport/NetUtils.hh | 2 +- include/gz/transport/Node.hh | 4 ++-- include/gz/transport/NodeOptions.hh | 2 +- include/gz/transport/NodeShared.hh | 2 +- include/gz/transport/Packet.hh | 2 +- include/gz/transport/Publisher.hh | 4 ++-- include/gz/transport/RepHandler.hh | 2 +- include/gz/transport/ReqHandler.hh | 2 +- include/gz/transport/SubscribeOptions.hh | 2 +- include/gz/transport/SubscriptionHandler.hh | 4 ++-- include/gz/transport/TopicStatistics.hh | 4 ++-- include/gz/transport/TopicStorage.hh | 2 +- include/gz/transport/TopicUtils.hh | 2 +- include/gz/transport/TransportTypes.hh | 2 +- include/gz/transport/Uuid.hh | 2 +- include/gz/transport/config.hh.in | 9 +++++++++ include/gz/transport/detail/Node.hh | 2 +- include/ignition/transport/config.hh | 10 ---------- log/include/gz/transport/log/Batch.hh | 2 +- log/include/gz/transport/log/Descriptor.hh | 2 +- log/include/gz/transport/log/Log.hh | 2 +- log/include/gz/transport/log/Message.hh | 2 +- log/include/gz/transport/log/MsgIter.hh | 2 +- log/include/gz/transport/log/Playback.hh | 2 +- log/include/gz/transport/log/QualifiedTime.hh | 2 +- log/include/gz/transport/log/QueryOptions.hh | 2 +- log/include/gz/transport/log/Recorder.hh | 2 +- log/include/gz/transport/log/SqlStatement.hh | 2 +- .../gz/transport/log/detail/QueryOptions.hh | 2 +- log/sql/0.1.0.sql | 2 +- log/src/BatchPrivate.hh | 4 ++-- log/src/Console.cc | 2 +- log/src/Console.hh | 2 +- log/src/Descriptor.hh | 2 +- log/src/MsgIterPrivate.hh | 6 +++--- log/test/CMakeLists.txt | 2 +- log/test/integration/ChirpParams.hh | 4 ++-- src/AdvertiseOptions.cc | 2 +- src/CIface_TEST.cc | 6 +++--- src/Clock.cc | 2 +- src/Clock_TEST.cc | 2 +- src/Discovery.cc | 2 +- src/HandlerStorage_TEST.cc | 2 +- src/Helpers.cc | 2 +- src/MessageInfo.cc | 2 +- src/NetUtils.cc | 2 +- src/Node.cc | 8 ++++---- src/NodeOptionsPrivate.hh | 2 +- src/NodePrivate.hh | 2 +- src/NodeShared.cc | 2 +- src/NodeSharedPrivate.hh | 2 +- src/Node_TEST.cc | 2 +- src/SubscribeOptionsPrivate.hh | 2 +- src/SubscriptionHandler.cc | 2 +- src/TopicStatistics.cc | 2 +- src/cmd/cmdtransport.rb.in | 6 +++--- src/gz.cc | 2 +- src/gz.hh | 6 +++--- src/gz_TEST.cc | 10 +++++----- src/gz_src_TEST.cc | 2 +- test/CMakeLists.txt | 2 +- test/integration/authPubSub.cc | 2 +- .../authPubSubSubscriberInvalid_aux.cc | 2 +- test/integration/fastPub_aux.cc | 2 +- test/integration/pub_aux.cc | 2 +- test/integration/pub_aux_throttled.cc | 2 +- test/integration/scopedTopic.cc | 2 +- test/integration/scopedTopicSubscriber_aux.cc | 2 +- test/integration/statistics.cc | 2 +- test/integration/twoProcsPubSub.cc | 4 ++-- test/integration/twoProcsPubSubSubscriber_aux.cc | 2 +- test/integration/twoProcsPublisher_aux.cc | 2 +- test/integration/twoProcsSrvCall.cc | 6 +++--- .../integration/twoProcsSrvCallReplierInc_aux.cc | 2 +- test/integration/twoProcsSrvCallReplier_aux.cc | 2 +- test/integration/twoProcsSrvCallStress.cc | 2 +- test/integration/twoProcsSrvCallSync1.cc | 2 +- test/integration/twoProcsSrvCallWithoutInput.cc | 6 +++--- .../twoProcsSrvCallWithoutInputReplierInc_aux.cc | 2 +- .../twoProcsSrvCallWithoutInputReplier_aux.cc | 2 +- .../twoProcsSrvCallWithoutInputStress.cc | 2 +- .../twoProcsSrvCallWithoutInputSync1.cc | 2 +- test/integration/twoProcsSrvCallWithoutOutput.cc | 4 ++-- ...twoProcsSrvCallWithoutOutputReplierInc_aux.cc | 2 +- .../twoProcsSrvCallWithoutOutputReplier_aux.cc | 2 +- .../twoProcsSrvCallWithoutOutputStress.cc | 2 +- tutorials/04_messages.md | 6 +++--- tutorials/05_services.md | 16 ++++++++-------- tutorials/06_security.md | 6 +++--- tutorials/10_logging.md | 2 +- 114 files changed, 161 insertions(+), 162 deletions(-) diff --git a/example/bench.cc b/example/bench.cc index 2347158c3..bcfb37d49 100644 --- a/example/bench.cc +++ b/example/bench.cc @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include DEFINE_bool(h, false, "Show help"); diff --git a/example/publisher.cc b/example/publisher.cc index c4e6717ab..c0ecc3126 100644 --- a/example/publisher.cc +++ b/example/publisher.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include /// \brief Flag used to break the publisher loop and terminate the program. diff --git a/example/publisher_c.cc b/example/publisher_c.cc index 6db87f333..4d2be05f6 100644 --- a/example/publisher_c.cc +++ b/example/publisher_c.cc @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include static bool g_terminatePub = false; diff --git a/example/publisher_c_fast.cc b/example/publisher_c_fast.cc index c2d832970..ebc2c5c02 100644 --- a/example/publisher_c_fast.cc +++ b/example/publisher_c_fast.cc @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include static bool g_terminatePub = false; diff --git a/example/publisher_raw.cc b/example/publisher_raw.cc index e7eab9752..36ee70ce3 100644 --- a/example/publisher_raw.cc +++ b/example/publisher_raw.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include /// \brief Flag used to break the publisher loop and terminate the program. diff --git a/example/requester.cc b/example/requester.cc index 228a7058d..9836176b7 100644 --- a/example/requester.cc +++ b/example/requester.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/requester_async.cc b/example/requester_async.cc index 4ed67fb10..56618cbbb 100644 --- a/example/requester_async.cc +++ b/example/requester_async.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/requester_async_no_input.cc b/example/requester_async_no_input.cc index f0c922f98..4cd9ed290 100644 --- a/example/requester_async_no_input.cc +++ b/example/requester_async_no_input.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/requester_no_input.cc b/example/requester_no_input.cc index a405bb8ec..1401c231b 100644 --- a/example/requester_no_input.cc +++ b/example/requester_no_input.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/requester_oneway.cc b/example/requester_oneway.cc index 2b6c0b1a2..f10428813 100644 --- a/example/requester_oneway.cc +++ b/example/requester_oneway.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/responser.cc b/example/responser.cc index cebf6b9be..ce95192df 100644 --- a/example/responser.cc +++ b/example/responser.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/responser_no_input.cc b/example/responser_no_input.cc index 698928693..7959b479f 100644 --- a/example/responser_no_input.cc +++ b/example/responser_no_input.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/responser_oneway.cc b/example/responser_oneway.cc index b1bf812f3..00df88721 100644 --- a/example/responser_oneway.cc +++ b/example/responser_oneway.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/subscriber.cc b/example/subscriber.cc index f4b02d9f9..e30bf04ad 100644 --- a/example/subscriber.cc +++ b/example/subscriber.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/subscriber_c.cc b/example/subscriber_c.cc index 1270c09ef..51cf1771f 100644 --- a/example/subscriber_c.cc +++ b/example/subscriber_c.cc @@ -15,7 +15,7 @@ * */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/subscriber_c_slow.cc b/example/subscriber_c_slow.cc index b535a4e3b..0bf3f8838 100644 --- a/example/subscriber_c_slow.cc +++ b/example/subscriber_c_slow.cc @@ -15,7 +15,7 @@ * */ #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/subscriber_raw.cc b/example/subscriber_raw.cc index 88e6bf1e8..4a08e6e32 100644 --- a/example/subscriber_raw.cc +++ b/example/subscriber_raw.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/example/subscriber_stats.cc b/example/subscriber_stats.cc index 8fe495ab4..e359d78cd 100644 --- a/example/subscriber_stats.cc +++ b/example/subscriber_stats.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/include/gz/transport/AdvertiseOptions.hh b/include/gz/transport/AdvertiseOptions.hh index a465a5a0d..97bd15070 100644 --- 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 index ad01953ac..f532b527c 100644 --- 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 index ad7854c5a..ab9b647f0 100644 --- a/include/gz/transport/Discovery.hh +++ b/include/gz/transport/Discovery.hh @@ -56,7 +56,7 @@ #pragma warning(disable: 4996) #endif -#include +#include #include #include @@ -68,7 +68,7 @@ #include #include -#include +#include #include "gz/transport/config.hh" #include "gz/transport/Export.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 index d1b4b48ff..c8544f967 100644 --- 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 index 18f11f41a..057a39af4 100644 --- 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 index 20acf313c..d3c3a104f 100644 --- 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 index f63bf93b2..695088988 100644 --- 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 index 110ce1b92..56c2ecff9 100644 --- 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 +#include #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 index a5c600066..8ec12ea62 100644 --- 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 index d3d8b1587..60a5314a7 100644 --- 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 index 6d18d104f..3e7ac2bb0 100644 --- 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 index 5de853356..07e777701 100644 --- a/include/gz/transport/Publisher.hh +++ b/include/gz/transport/Publisher.hh @@ -18,7 +18,7 @@ #ifndef GZ_TRANSPORT_PUBLISHER_HH_ #define GZ_TRANSPORT_PUBLISHER_HH_ -#include +#include #include #include @@ -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 index 29c7eb05a..5d27f98c1 100644 --- 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 index a98ad60b7..1f8b51c78 100644 --- 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 index 174d9e228..c05f7f0e1 100644 --- 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 index 85e6aef79..e4e8b76fb 100644 --- a/include/gz/transport/SubscriptionHandler.hh +++ b/include/gz/transport/SubscriptionHandler.hh @@ -38,7 +38,7 @@ #include #include -#include +#include #include "gz/transport/config.hh" #include "gz/transport/Export.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 index 84df20479..cddf207d1 100644 --- a/include/gz/transport/TopicStatistics.hh +++ b/include/gz/transport/TopicStatistics.hh @@ -17,7 +17,7 @@ #ifndef GZ_TRANSPORT_TOPICSTATISTICS_HH_ #define GZ_TRANSPORT_TOPICSTATISTICS_HH_ -#include +#include #include #include @@ -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 index 08b2625d6..e89ad895f 100644 --- 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 index 626ffb20d..64a5c8089 100644 --- 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 index e1ed0f24c..6b9fea878 100644 --- 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 index 1522dc327..f9d7977e0 100644 --- 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 index d1a53f9f0..1f5832327 100644 --- 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 index 9ad91a1eb..fdefdf8d5 100644 --- a/include/gz/transport/detail/Node.hh +++ b/include/gz/transport/detail/Node.hh @@ -21,7 +21,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/include/ignition/transport/config.hh b/include/ignition/transport/config.hh index e6af516d7..48c98ed95 100644 --- 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 index 81b0ef35b..893fe9014 100644 --- a/log/include/gz/transport/log/Batch.hh +++ b/log/include/gz/transport/log/Batch.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/Descriptor.hh b/log/include/gz/transport/log/Descriptor.hh index 772043b79..fccc13817 100644 --- a/log/include/gz/transport/log/Descriptor.hh +++ b/log/include/gz/transport/log/Descriptor.hh @@ -26,7 +26,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/Log.hh b/log/include/gz/transport/log/Log.hh index fccf510d3..e0f0f3ed6 100644 --- a/log/include/gz/transport/log/Log.hh +++ b/log/include/gz/transport/log/Log.hh @@ -29,7 +29,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/Message.hh b/log/include/gz/transport/log/Message.hh index 4b30e76b7..61b856879 100644 --- a/log/include/gz/transport/log/Message.hh +++ b/log/include/gz/transport/log/Message.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/MsgIter.hh b/log/include/gz/transport/log/MsgIter.hh index f2c30a613..e77ab8410 100644 --- a/log/include/gz/transport/log/MsgIter.hh +++ b/log/include/gz/transport/log/MsgIter.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/Playback.hh b/log/include/gz/transport/log/Playback.hh index 72bf87881..711d87931 100644 --- a/log/include/gz/transport/log/Playback.hh +++ b/log/include/gz/transport/log/Playback.hh @@ -26,7 +26,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/QualifiedTime.hh b/log/include/gz/transport/log/QualifiedTime.hh index 0d3557388..6fedb08a4 100644 --- a/log/include/gz/transport/log/QualifiedTime.hh +++ b/log/include/gz/transport/log/QualifiedTime.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/QueryOptions.hh b/log/include/gz/transport/log/QueryOptions.hh index 617dff2a9..b133d36e8 100644 --- a/log/include/gz/transport/log/QueryOptions.hh +++ b/log/include/gz/transport/log/QueryOptions.hh @@ -30,7 +30,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/Recorder.hh b/log/include/gz/transport/log/Recorder.hh index b49b34b58..5ea40984e 100644 --- a/log/include/gz/transport/log/Recorder.hh +++ b/log/include/gz/transport/log/Recorder.hh @@ -27,7 +27,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/SqlStatement.hh b/log/include/gz/transport/log/SqlStatement.hh index 7c0a256c6..ff0ad4a07 100644 --- a/log/include/gz/transport/log/SqlStatement.hh +++ b/log/include/gz/transport/log/SqlStatement.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/include/gz/transport/log/detail/QueryOptions.hh b/log/include/gz/transport/log/detail/QueryOptions.hh index 8f3b485cf..cdd3a9132 100644 --- a/log/include/gz/transport/log/detail/QueryOptions.hh +++ b/log/include/gz/transport/log/detail/QueryOptions.hh @@ -24,7 +24,7 @@ #include #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/sql/0.1.0.sql b/log/sql/0.1.0.sql index 9d25cae85..c0e2bf139 100644 --- a/log/sql/0.1.0.sql +++ b/log/sql/0.1.0.sql @@ -36,7 +36,7 @@ INSERT INTO migrations (to_version) VALUES ('0.1.0'); CREATE TABLE message_types ( /* Uniquely identifies a row in this table. Sqlite3 will make it an alias of rowid. */ id INTEGER PRIMARY KEY AUTOINCREMENT, - /* Name of the message (e.g. .gz.msgs.LaserScan) */ + /* Name of the message (e.g. .ignition.msgs.LaserScan) */ name TEXT NOT NULL, /* Full text of the protobuf file, or NULL if logging did not have access to it */ proto_descriptor TEXT diff --git a/log/src/BatchPrivate.hh b/log/src/BatchPrivate.hh index 9521bad5b..b680ed5eb 100644 --- a/log/src/BatchPrivate.hh +++ b/log/src/BatchPrivate.hh @@ -23,8 +23,8 @@ #include "gz/transport/log/SqlStatement.hh" #include "raii-sqlite3.hh" -using namespace gz::transport; -using namespace gz::transport::log; +using namespace ignition::transport; +using namespace ignition::transport::log; /// \brief Private implementation for Batch /// \internal diff --git a/log/src/Console.cc b/log/src/Console.cc index 18bef3832..8695d6a00 100644 --- a/log/src/Console.cc +++ b/log/src/Console.cc @@ -17,7 +17,7 @@ #include "Console.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/log/src/Console.hh b/log/src/Console.hh index 4acf84ed0..644f65504 100644 --- a/log/src/Console.hh +++ b/log/src/Console.hh @@ -22,7 +22,7 @@ #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/src/Descriptor.hh b/log/src/Descriptor.hh index cc78708ea..13849d8f1 100644 --- a/log/src/Descriptor.hh +++ b/log/src/Descriptor.hh @@ -24,7 +24,7 @@ #include -namespace gz +namespace ignition { namespace transport { diff --git a/log/src/MsgIterPrivate.hh b/log/src/MsgIterPrivate.hh index 2a0bd4787..cf8b99967 100644 --- a/log/src/MsgIterPrivate.hh +++ b/log/src/MsgIterPrivate.hh @@ -25,10 +25,10 @@ #include "gz/transport/log/SqlStatement.hh" #include "raii-sqlite3.hh" -using namespace gz::transport; -using namespace gz::transport::log; +using namespace ignition::transport; +using namespace ignition::transport::log; -namespace gz +namespace ignition { namespace transport { diff --git a/log/test/CMakeLists.txt b/log/test/CMakeLists.txt index 2ab75a4a6..b3c1a57fa 100644 --- a/log/test/CMakeLists.txt +++ b/log/test/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(integration) configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/log/include/ignition/transport/log/test_config.h) -configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/log/include/ignition/transport/log/test_config.h) +configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/log/include/gz/transport/log/test_config.h) diff --git a/log/test/integration/ChirpParams.hh b/log/test/integration/ChirpParams.hh index 344156a27..78a38d22d 100644 --- a/log/test/integration/ChirpParams.hh +++ b/log/test/integration/ChirpParams.hh @@ -18,7 +18,7 @@ #ifndef GZ_TRANSPORT_LOG_TEST_INTEGRATION_CHIRPPARAMS_HH_ #define GZ_TRANSPORT_LOG_TEST_INTEGRATION_CHIRPPARAMS_HH_ -#include +#include #include #include @@ -27,7 +27,7 @@ #include -namespace gz +namespace ignition { namespace transport { diff --git a/src/AdvertiseOptions.cc b/src/AdvertiseOptions.cc index 1d1b56dff..0534343b7 100644 --- a/src/AdvertiseOptions.cc +++ b/src/AdvertiseOptions.cc @@ -25,7 +25,7 @@ using namespace gz; using namespace transport; -namespace gz +namespace ignition { namespace transport { diff --git a/src/CIface_TEST.cc b/src/CIface_TEST.cc index 1e2886ce1..0085e25b1 100644 --- a/src/CIface_TEST.cc +++ b/src/CIface_TEST.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include +#include #include "gtest/gtest.h" #include "gz/transport/CIface.h" @@ -33,7 +33,7 @@ void cb(const char *_data, size_t _size, const char *_msgType, void *_userData) gz::msgs::StringMsg msg; msg.ParseFromArray(_data, _size); - EXPECT_STREQ("gz.msgs.StringMsg", _msgType); + EXPECT_STREQ("ignition.msgs.StringMsg", _msgType); EXPECT_EQ(msg.data(), "HELLO"); ++count; } @@ -49,7 +49,7 @@ void cbNonConst(char *_data, size_t _size, char *_msgType, void *_userData) gz::msgs::StringMsg msg; msg.ParseFromArray(_data, _size); - EXPECT_STREQ("gz.msgs.StringMsg", _msgType); + EXPECT_STREQ("ignition.msgs.StringMsg", _msgType); EXPECT_EQ(msg.data(), "HELLO"); ++count; } diff --git a/src/Clock.cc b/src/Clock.cc index f1afb987b..a8d2f4986 100644 --- a/src/Clock.cc +++ b/src/Clock.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/src/Clock_TEST.cc b/src/Clock_TEST.cc index 3926c5772..c192ae354 100644 --- a/src/Clock_TEST.cc +++ b/src/Clock_TEST.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include "gz/transport/Clock.hh" #include "gz/transport/Node.hh" diff --git a/src/Discovery.cc b/src/Discovery.cc index 14a4d3869..736a39e7d 100644 --- a/src/Discovery.cc +++ b/src/Discovery.cc @@ -27,7 +27,7 @@ #include "gz/transport/Discovery.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/HandlerStorage_TEST.cc b/src/HandlerStorage_TEST.cc index 62703446c..e095e533e 100644 --- a/src/HandlerStorage_TEST.cc +++ b/src/HandlerStorage_TEST.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/HandlerStorage.hh" #include "gz/transport/MessageInfo.hh" diff --git a/src/Helpers.cc b/src/Helpers.cc index f7f513f52..cb1601e7e 100644 --- a/src/Helpers.cc +++ b/src/Helpers.cc @@ -26,7 +26,7 @@ #include "gz/transport/Helpers.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/MessageInfo.cc b/src/MessageInfo.cc index 68d17d30c..8a37f45d8 100644 --- a/src/MessageInfo.cc +++ b/src/MessageInfo.cc @@ -23,7 +23,7 @@ using namespace gz; using namespace transport; -namespace gz +namespace ignition { namespace transport { diff --git a/src/NetUtils.cc b/src/NetUtils.cc index 654504aa3..763bc9cc0 100644 --- a/src/NetUtils.cc +++ b/src/NetUtils.cc @@ -55,7 +55,7 @@ using namespace gz; -namespace gz +namespace ignition { namespace transport { diff --git a/src/Node.cc b/src/Node.cc index c578768c0..c32c14764 100644 --- a/src/Node.cc +++ b/src/Node.cc @@ -14,8 +14,8 @@ * limitations under the License. * */ -#include -#include +#include +#include #include #include @@ -48,7 +48,7 @@ using namespace gz; using namespace transport; -namespace gz +namespace ignition { namespace transport { @@ -830,7 +830,7 @@ bool Node::EnableStats(const std::string &_topic, bool _enable, AdvertiseMessageOptions opts; opts.SetMsgsPerSec(_publicationRate); this->dataPtr->statPub = this->Advertise(_publicationTopic, - "gz.msgs.Metric", opts); + "ignition.msgs.Metric", opts); // Callback used to publish a statistics message. // cppcheck-suppress unreadVariable diff --git a/src/NodeOptionsPrivate.hh b/src/NodeOptionsPrivate.hh index a771d1386..03a1e45a0 100644 --- a/src/NodeOptionsPrivate.hh +++ b/src/NodeOptionsPrivate.hh @@ -24,7 +24,7 @@ #include "gz/transport/config.hh" #include "gz/transport/NetUtils.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/NodePrivate.hh b/src/NodePrivate.hh index 39c032680..499c21906 100644 --- a/src/NodePrivate.hh +++ b/src/NodePrivate.hh @@ -26,7 +26,7 @@ #include "gz/transport/Node.hh" #include "gz/transport/NodeShared.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/NodeShared.cc b/src/NodeShared.cc index 4f2cc6c18..9d2cc2440 100644 --- a/src/NodeShared.cc +++ b/src/NodeShared.cc @@ -38,7 +38,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/src/NodeSharedPrivate.hh b/src/NodeSharedPrivate.hh index c652abb57..602a430d9 100644 --- a/src/NodeSharedPrivate.hh +++ b/src/NodeSharedPrivate.hh @@ -36,7 +36,7 @@ #include "gz/transport/Discovery.hh" #include "gz/transport/Node.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/Node_TEST.cc b/src/Node_TEST.cc index ba3981050..b22ce7edf 100644 --- a/src/Node_TEST.cc +++ b/src/Node_TEST.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/AdvertiseOptions.hh" diff --git a/src/SubscribeOptionsPrivate.hh b/src/SubscribeOptionsPrivate.hh index dcac70424..2878e235b 100644 --- a/src/SubscribeOptionsPrivate.hh +++ b/src/SubscribeOptionsPrivate.hh @@ -22,7 +22,7 @@ #include "gz/transport/Helpers.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/SubscriptionHandler.cc b/src/SubscriptionHandler.cc index ac1857675..fbde42a90 100644 --- a/src/SubscriptionHandler.cc +++ b/src/SubscriptionHandler.cc @@ -17,7 +17,7 @@ #include "gz/transport/SubscriptionHandler.hh" -namespace gz +namespace ignition { namespace transport { diff --git a/src/TopicStatistics.cc b/src/TopicStatistics.cc index a79b1aed8..a4e030aed 100644 --- a/src/TopicStatistics.cc +++ b/src/TopicStatistics.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include +#include #include #include diff --git a/src/cmd/cmdtransport.rb.in b/src/cmd/cmdtransport.rb.in index c0ff486e1..a8b4d3a6c 100644 --- a/src/cmd/cmdtransport.rb.in +++ b/src/cmd/cmdtransport.rb.in @@ -58,7 +58,7 @@ COMMANDS = { 'topic' => " The format expected is\n " + " the same used by Protobuf DebugString(). E.g.:\n\n" + " ign topic -t /foo -m " + - " gz.msgs.StringMsg\n " + + " ignition.msgs.StringMsg\n " + " -p \'data:\"Custom data\"\'\n\n" + " Requires -t and -m.\n" + " \n"+ @@ -100,9 +100,9 @@ COMMANDS = { 'topic' => " The format expected is\n " + " the same used by Protobuf DebugString(). E.g.:\n\n" + " ign service -s /echo\n" + - " --reqtype gz.msgs"+ + " --reqtype ignition.msgs"+ ".StringMsg\n" + - " --reptype gz.msgs"+ + " --reptype ignition.msgs"+ ".StringMsg\n" + " --timeout 2000 --req \'"+ "data: \"Hello\"\n\n" + diff --git a/src/gz.cc b/src/gz.cc index 3ecb9c1e4..ae9407872 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -24,7 +24,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/src/gz.hh b/src/gz.hh index 6f83f3be0..9833abf26 100644 --- a/src/gz.hh +++ b/src/gz.hh @@ -41,7 +41,7 @@ extern "C" void IGNITION_TRANSPORT_VISIBLE cmdServiceList(); /// \param[in] _msgType Message type. /// \param[in] _msgData The format expected is the same used by Protobuf /// DebugString(). -/// E.g.: cmdTopicPub("/foo", "gz.msgs.StringMsg", +/// E.g.: cmdTopicPub("/foo", "ignition.msgs.StringMsg", /// "'data:\"Custom data\"'); extern "C" void IGNITION_TRANSPORT_VISIBLE cmdTopicPub(const char *_topic, const char *_msgType, @@ -54,8 +54,8 @@ extern "C" void IGNITION_TRANSPORT_VISIBLE cmdTopicPub(const char *_topic, /// \param[in] _timeout The request will timeout after '_timeout' ms. /// \param[in] _reqData Input data sent in the request. /// The format expected is the same used by Protobuf DebugString(). -/// E.g.: cmdServiceReq("/bar", "gz.msgs.StringMsg", -/// "gz.msgs.StringMsg", 1000, +/// E.g.: cmdServiceReq("/bar", "ignition.msgs.StringMsg", +/// "ignition.msgs.StringMsg", 1000, /// "'data:\"Custom data\"'); extern "C" void IGNITION_TRANSPORT_VISIBLE cmdServiceReq(const char *_service, const char *_reqType, diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc index a516d6b9e..761f649c9 100644 --- a/src/gz_TEST.cc +++ b/src/gz_TEST.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "gtest/gtest.h" @@ -135,7 +135,7 @@ TEST(ignTest, TopicInfo) EXPECT_TRUE(infoFound) << "OUTPUT[" << output << "] Size[" << output.size() << "]. Expected Size=50" << std::endl; - EXPECT_TRUE(output.find("gz.msgs.Vector3d") != std::string::npos); + EXPECT_TRUE(output.find("ignition.msgs.Vector3d") != std::string::npos); // Wait for the child process to return. testing::waitAndCleanupFork(pi); @@ -200,7 +200,7 @@ TEST(ignTest, ServiceInfo) } EXPECT_TRUE(infoFound); - EXPECT_TRUE(output.find("gz.msgs.Int32") != std::string::npos); + EXPECT_TRUE(output.find("ignition.msgs.Int32") != std::string::npos); // Wait for the child process to return. testing::waitAndCleanupFork(pi); @@ -267,7 +267,7 @@ TEST(ignTest, TopicInfoSameProc) } EXPECT_TRUE(infoFound); - EXPECT_TRUE(output.find("gz.msgs.Vector3d") != std::string::npos); + EXPECT_TRUE(output.find("ignition.msgs.Vector3d") != std::string::npos); } ////////////////////////////////////////////////// @@ -315,7 +315,7 @@ TEST(ignTest, ServiceInfoSameProc) } EXPECT_TRUE(infoFound); - EXPECT_TRUE(output.find("gz.msgs.Int32") != std::string::npos); + EXPECT_TRUE(output.find("ignition.msgs.Int32") != std::string::npos); } diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc index 7117e5b33..2e470d4f6 100644 --- a/src/gz_src_TEST.cc +++ b/src/gz_src_TEST.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gtest/gtest.h" #include "gz.hh" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 796e5bfcc..a4de3196a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories ( ) configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/ignition/transport/test_config.h) -configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/ignition/transport/test_config.h) +configure_file (test_config.h.in ${PROJECT_BINARY_DIR}/include/gz/transport/test_config.h) # Build gtest add_library(gtest STATIC gtest/src/gtest-all.cc) diff --git a/test/integration/authPubSub.cc b/test/integration/authPubSub.cc index 09a3d7907..99fd7001a 100644 --- a/test/integration/authPubSub.cc +++ b/test/integration/authPubSub.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/Node.hh" diff --git a/test/integration/authPubSubSubscriberInvalid_aux.cc b/test/integration/authPubSubSubscriberInvalid_aux.cc index 4716d74f9..3dea37402 100644 --- a/test/integration/authPubSubSubscriberInvalid_aux.cc +++ b/test/integration/authPubSubSubscriberInvalid_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #ifdef _WIN32 #include #endif diff --git a/test/integration/fastPub_aux.cc b/test/integration/fastPub_aux.cc index 3bcf35b65..30bb33bc9 100644 --- a/test/integration/fastPub_aux.cc +++ b/test/integration/fastPub_aux.cc @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gz/transport/test_config.h" diff --git a/test/integration/pub_aux.cc b/test/integration/pub_aux.cc index 47eaeafad..1f13d06a9 100644 --- a/test/integration/pub_aux.cc +++ b/test/integration/pub_aux.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/Node.hh" diff --git a/test/integration/pub_aux_throttled.cc b/test/integration/pub_aux_throttled.cc index 11eccff1e..e982ad5a0 100644 --- a/test/integration/pub_aux_throttled.cc +++ b/test/integration/pub_aux_throttled.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/Node.hh" diff --git a/test/integration/scopedTopic.cc b/test/integration/scopedTopic.cc index 3993e0954..c2e882e65 100644 --- a/test/integration/scopedTopic.cc +++ b/test/integration/scopedTopic.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/AdvertiseOptions.hh" #include "gz/transport/Node.hh" diff --git a/test/integration/scopedTopicSubscriber_aux.cc b/test/integration/scopedTopicSubscriber_aux.cc index 747bd8b93..55952c8d6 100644 --- a/test/integration/scopedTopicSubscriber_aux.cc +++ b/test/integration/scopedTopicSubscriber_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/statistics.cc b/test/integration/statistics.cc index e1cf74aee..580586469 100644 --- a/test/integration/statistics.cc +++ b/test/integration/statistics.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/Node.hh" diff --git a/test/integration/twoProcsPubSub.cc b/test/integration/twoProcsPubSub.cc index e4e3395a5..80abfe4fe 100644 --- a/test/integration/twoProcsPubSub.cc +++ b/test/integration/twoProcsPubSub.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gtest/gtest.h" #include "gz/transport/Node.hh" @@ -525,7 +525,7 @@ TEST(twoProcPubSub, TopicInfo) EXPECT_TRUE(node.TopicInfo("/foo", publishers)); EXPECT_EQ(publishers.size(), 1u); - EXPECT_EQ(publishers.front().MsgTypeName(), "gz.msgs.Vector3d"); + EXPECT_EQ(publishers.front().MsgTypeName(), "ignition.msgs.Vector3d"); reset(); diff --git a/test/integration/twoProcsPubSubSubscriber_aux.cc b/test/integration/twoProcsPubSubSubscriber_aux.cc index 0a5aba242..c5c0d108d 100644 --- a/test/integration/twoProcsPubSubSubscriber_aux.cc +++ b/test/integration/twoProcsPubSubSubscriber_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #ifdef _WIN32 #include #endif diff --git a/test/integration/twoProcsPublisher_aux.cc b/test/integration/twoProcsPublisher_aux.cc index 1deb0e30b..906883f7e 100644 --- a/test/integration/twoProcsPublisher_aux.cc +++ b/test/integration/twoProcsPublisher_aux.cc @@ -16,7 +16,7 @@ */ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gz/transport/test_config.h" diff --git a/test/integration/twoProcsSrvCall.cc b/test/integration/twoProcsSrvCall.cc index b9ced1a63..1ea31d0dd 100644 --- a/test/integration/twoProcsSrvCall.cc +++ b/test/integration/twoProcsSrvCall.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gz/transport/TopicUtils.hh" @@ -322,8 +322,8 @@ TEST(twoProcSrvCall, ServiceInfo) EXPECT_TRUE(node.ServiceInfo("/foo", publishers)); EXPECT_EQ(publishers.size(), 1u); - EXPECT_EQ(publishers.front().ReqTypeName(), "gz.msgs.Int32"); - EXPECT_EQ(publishers.front().RepTypeName(), "gz.msgs.Int32"); + EXPECT_EQ(publishers.front().ReqTypeName(), "ignition.msgs.Int32"); + EXPECT_EQ(publishers.front().RepTypeName(), "ignition.msgs.Int32"); reset(); diff --git a/test/integration/twoProcsSrvCallReplierInc_aux.cc b/test/integration/twoProcsSrvCallReplierInc_aux.cc index 3ee2876f1..0c9f33beb 100644 --- a/test/integration/twoProcsSrvCallReplierInc_aux.cc +++ b/test/integration/twoProcsSrvCallReplierInc_aux.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallReplier_aux.cc b/test/integration/twoProcsSrvCallReplier_aux.cc index 49e33a0ca..69244e52b 100644 --- a/test/integration/twoProcsSrvCallReplier_aux.cc +++ b/test/integration/twoProcsSrvCallReplier_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallStress.cc b/test/integration/twoProcsSrvCallStress.cc index 29469d20e..c50940e70 100644 --- a/test/integration/twoProcsSrvCallStress.cc +++ b/test/integration/twoProcsSrvCallStress.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallSync1.cc b/test/integration/twoProcsSrvCallSync1.cc index 655e74b84..843351787 100644 --- a/test/integration/twoProcsSrvCallSync1.cc +++ b/test/integration/twoProcsSrvCallSync1.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutInput.cc b/test/integration/twoProcsSrvCallWithoutInput.cc index c23d03a0d..5ce211282 100644 --- a/test/integration/twoProcsSrvCallWithoutInput.cc +++ b/test/integration/twoProcsSrvCallWithoutInput.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gz/transport/TopicUtils.hh" @@ -272,8 +272,8 @@ TEST(twoProcSrvCallWithoutInput, ServiceInfo) EXPECT_TRUE(node.ServiceInfo("/foo", publishers)); EXPECT_EQ(publishers.size(), 1u); - EXPECT_EQ(publishers.front().ReqTypeName(), "gz.msgs.Empty"); - EXPECT_EQ(publishers.front().RepTypeName(), "gz.msgs.Int32"); + EXPECT_EQ(publishers.front().ReqTypeName(), "ignition.msgs.Empty"); + EXPECT_EQ(publishers.front().RepTypeName(), "ignition.msgs.Int32"); reset(); diff --git a/test/integration/twoProcsSrvCallWithoutInputReplierInc_aux.cc b/test/integration/twoProcsSrvCallWithoutInputReplierInc_aux.cc index a0c79861d..a5b29f42c 100644 --- a/test/integration/twoProcsSrvCallWithoutInputReplierInc_aux.cc +++ b/test/integration/twoProcsSrvCallWithoutInputReplierInc_aux.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutInputReplier_aux.cc b/test/integration/twoProcsSrvCallWithoutInputReplier_aux.cc index f871843f1..754f28ec7 100644 --- a/test/integration/twoProcsSrvCallWithoutInputReplier_aux.cc +++ b/test/integration/twoProcsSrvCallWithoutInputReplier_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutInputStress.cc b/test/integration/twoProcsSrvCallWithoutInputStress.cc index d40d40079..1b9ee0b7c 100644 --- a/test/integration/twoProcsSrvCallWithoutInputStress.cc +++ b/test/integration/twoProcsSrvCallWithoutInputStress.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutInputSync1.cc b/test/integration/twoProcsSrvCallWithoutInputSync1.cc index 02ecacf32..afb43eb04 100644 --- a/test/integration/twoProcsSrvCallWithoutInputSync1.cc +++ b/test/integration/twoProcsSrvCallWithoutInputSync1.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutOutput.cc b/test/integration/twoProcsSrvCallWithoutOutput.cc index 1bb56769c..39e515734 100644 --- a/test/integration/twoProcsSrvCallWithoutOutput.cc +++ b/test/integration/twoProcsSrvCallWithoutOutput.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gz/transport/TopicUtils.hh" @@ -156,7 +156,7 @@ TEST(twoProcSrvCallWithoutOutput, ServiceInfo) EXPECT_TRUE(node.ServiceInfo("/foo", publishers)); EXPECT_EQ(publishers.size(), 1u); - EXPECT_EQ(publishers.front().ReqTypeName(), "gz.msgs.Int32"); + EXPECT_EQ(publishers.front().ReqTypeName(), "ignition.msgs.Int32"); reset(); diff --git a/test/integration/twoProcsSrvCallWithoutOutputReplierInc_aux.cc b/test/integration/twoProcsSrvCallWithoutOutputReplierInc_aux.cc index 2054674fb..910316d42 100644 --- a/test/integration/twoProcsSrvCallWithoutOutputReplierInc_aux.cc +++ b/test/integration/twoProcsSrvCallWithoutOutputReplierInc_aux.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutOutputReplier_aux.cc b/test/integration/twoProcsSrvCallWithoutOutputReplier_aux.cc index 3c009aeb1..ec87cb3ba 100644 --- a/test/integration/twoProcsSrvCallWithoutOutputReplier_aux.cc +++ b/test/integration/twoProcsSrvCallWithoutOutputReplier_aux.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/test/integration/twoProcsSrvCallWithoutOutputStress.cc b/test/integration/twoProcsSrvCallWithoutOutputStress.cc index ef0da1fbc..f4a96fc39 100644 --- a/test/integration/twoProcsSrvCallWithoutOutputStress.cc +++ b/test/integration/twoProcsSrvCallWithoutOutputStress.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "gz/transport/Node.hh" #include "gtest/gtest.h" diff --git a/tutorials/04_messages.md b/tutorials/04_messages.md index b32cb0d7a..3be31f208 100644 --- a/tutorials/04_messages.md +++ b/tutorials/04_messages.md @@ -27,7 +27,7 @@ folder and open it with your favorite editor: #include #include #include -#include +#include #include /// brief Flag used to break the publisher loop and terminate the program. @@ -81,7 +81,7 @@ int main(int argc, char **argv) ### Walkthrough ```{.cpp} -#include +#include #include ``` @@ -138,7 +138,7 @@ file into the `ign_transport_tutorial` folder and open it with your favorite edi ```{.cpp} #include #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/tutorials/05_services.md b/tutorials/05_services.md index 7479654ad..6e2242cbb 100644 --- a/tutorials/05_services.md +++ b/tutorials/05_services.md @@ -31,7 +31,7 @@ folder and open it with your favorite editor: ```{.cpp} #include #include -#include +#include #include bool srvEcho(const gz::msgs::StringMsg &_req, @@ -71,7 +71,7 @@ int main(int argc, char **argv) ### Walkthrough ```{.cpp} -#include +#include #include ``` @@ -138,7 +138,7 @@ folder and open it with your favorite editor: ```{.cpp} #include -#include +#include #include ////////////////////////////////////////////////// @@ -233,7 +233,7 @@ Download the [requester_async.cc](https://github.com/ignitionrobotics/ign-transp ```{.cpp} #include -#include +#include #include void responseCb(const gz::msgs::StringMsg &_rep, const bool _result) @@ -321,7 +321,7 @@ Download the [responser_oneway.cc](https://github.com/ignitionrobotics/ign-trans #include #include #include -#include +#include ////////////////////////////////////////////////// void srvOneway(const gz::msgs::StringMsg &_req) @@ -395,7 +395,7 @@ Download the [requester_oneway.cc](https://github.com/ignitionrobotics/ign-trans ```{.cpp} #include #include -#include +#include ////////////////////////////////////////////////// int main(int argc, char **argv) @@ -454,7 +454,7 @@ favorite editor: ```{.cpp} #include #include -#include +#include #include bool srvQuote(gz::msgs::StringMsg &_rep) @@ -533,7 +533,7 @@ favorite editor: ```{.cpp} #include -#include +#include #include ////////////////////////////////////////////////// diff --git a/tutorials/06_security.md b/tutorials/06_security.md index 67f775aa7..e4f8b37d3 100644 --- a/tutorials/06_security.md +++ b/tutorials/06_security.md @@ -46,7 +46,7 @@ ign topic -t /foo -e ``` 2. Open a second terminal and publish a message on topic `/foo`. ``` -ign topic -t /foo -m gz.msgs.StringMsg -p 'data:"Unsecure message"' +ign topic -t /foo -m ignition.msgs.StringMsg -p 'data:"Unsecure message"' ``` 3. The first terminal should see the following output. ``` @@ -63,7 +63,7 @@ export IGN_TRANSPORT_PASSWORD=pass ``` 3. Now publish a message in the second terminal: ``` -ign topic -t /foo -m gz.msgs.StringMsg -p 'data:"Secure message"' +ign topic -t /foo -m ignition.msgs.StringMsg -p 'data:"Secure message"' ``` 4. The first terminal should not change, which indicates that subscriber was not able to authenticate with the secure publisher. @@ -82,7 +82,7 @@ ign topic -t /foo -e 3. Go back to the secure publisher in the second terminal, and re-run the publish command. ``` -ign topic -t /foo -m gz.msgs.StringMsg -p 'data:"Secure message"' +ign topic -t /foo -m ignition.msgs.StringMsg -p 'data:"Secure message"' ``` 4. The third terminal, running the secure subscriber, should output the following. diff --git a/tutorials/10_logging.md b/tutorials/10_logging.md index bf023d5c2..726147179 100644 --- a/tutorials/10_logging.md +++ b/tutorials/10_logging.md @@ -247,7 +247,7 @@ Press Ctrl+C to finish recording. From terminal 2, publish a message using `ign`: ```{.sh} -ign topic -t /foo -m gz.msgs.StringMsg -p 'data:"Hello log"' +ign topic -t /foo -m ignition.msgs.StringMsg -p 'data:"Hello log"' ``` From terminal 1, hit `CTRL-C` in your recorder terminal to stop the recording.