From 3a685287650f671327a324db459abd8fabea5530 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 19 May 2022 23:50:35 -0700 Subject: [PATCH] Migrate Export.hh macros and update deprecated test Signed-off-by: methylDragon --- include/gz/transport/AdvertiseOptions.hh | 6 +++--- include/gz/transport/CIface.h | 18 +++++++++--------- include/gz/transport/Clock.hh | 6 +++--- include/gz/transport/Discovery.hh | 2 +- include/gz/transport/Helpers.hh | 6 +++--- include/gz/transport/MessageInfo.hh | 2 +- include/gz/transport/NetUtils.hh | 8 ++++---- include/gz/transport/Node.hh | 10 +++++----- include/gz/transport/NodeOptions.hh | 2 +- include/gz/transport/NodeShared.hh | 2 +- include/gz/transport/Publisher.hh | 6 +++--- 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/TopicUtils.hh | 2 +- include/gz/transport/Uuid.hh | 2 +- 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 | 4 ++-- log/include/gz/transport/log/QualifiedTime.hh | 4 ++-- log/include/gz/transport/log/QueryOptions.hh | 10 +++++----- log/include/gz/transport/log/Recorder.hh | 2 +- log/include/gz/transport/log/SqlStatement.hh | 4 ++-- log/src/Descriptor.hh | 4 ++-- log/src/cmd/LogCommandAPI.hh | 6 +++--- test/integration/deprecated_TEST.cc | 2 ++ 31 files changed, 67 insertions(+), 65 deletions(-) diff --git a/include/gz/transport/AdvertiseOptions.hh b/include/gz/transport/AdvertiseOptions.hh index 7ac4d56bd..76f1b4b55 100644 --- a/include/gz/transport/AdvertiseOptions.hh +++ b/include/gz/transport/AdvertiseOptions.hh @@ -56,7 +56,7 @@ namespace gz /// \brief A class for customizing the publication options for a topic or /// service advertised. /// E.g.: Set the scope of a topic/service. - class IGNITION_TRANSPORT_VISIBLE AdvertiseOptions + class GZ_TRANSPORT_VISIBLE AdvertiseOptions { /// \brief Constructor. public: AdvertiseOptions(); @@ -131,7 +131,7 @@ namespace gz /// \brief A class for customizing the publication options for a topic /// advertised. /// E.g.: Set the rate of messages per second published. - class IGNITION_TRANSPORT_VISIBLE AdvertiseMessageOptions + class GZ_TRANSPORT_VISIBLE AdvertiseMessageOptions : public AdvertiseOptions { /// \brief Constructor. @@ -213,7 +213,7 @@ namespace gz /// \brief A class for customizing the publication options for a service /// advertised. - class IGNITION_TRANSPORT_VISIBLE AdvertiseServiceOptions + class GZ_TRANSPORT_VISIBLE AdvertiseServiceOptions : public AdvertiseOptions { /// \brief Constructor. diff --git a/include/gz/transport/CIface.h b/include/gz/transport/CIface.h index a8b847b48..3adc201cd 100644 --- a/include/gz/transport/CIface.h +++ b/include/gz/transport/CIface.h @@ -38,12 +38,12 @@ extern "C" { /// IGN_PARTITION environment variable. /// \return A pointer to a new transport node. Do not manually delete this /// pointer, instead use ignTransportNodeDestroy. - IgnTransportNode IGNITION_TRANSPORT_VISIBLE *ignTransportNodeCreate( + IgnTransportNode GZ_TRANSPORT_VISIBLE *ignTransportNodeCreate( const char *_partition); /// \brief Destroy a transport node. /// \param[in, out] _node The transport node to destroy. - void IGNITION_TRANSPORT_VISIBLE + void GZ_TRANSPORT_VISIBLE ignTransportNodeDestroy(IgnTransportNode **_node); /// \brief Advertise a topic. @@ -51,7 +51,7 @@ extern "C" { /// \param[in] _topic Topic on which to publish the message. /// \param[in] _msgType Name of the message type. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportAdvertise(IgnTransportNode *_node, const char *_topic, const char *_msgType); @@ -63,7 +63,7 @@ extern "C" { /// \param[in] _data Byte array of serialized data to publish. /// \param[in] _msgType Name of the message type. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportPublish(IgnTransportNode *_node, const char *_topic, const void *_data, @@ -75,7 +75,7 @@ extern "C" { /// \param[in] _callback The function to call when a message is received. /// \param[in] _userData Arbitrary user data pointer. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportSubscribe(IgnTransportNode *_node, const char *_topic, void (*_callback)(const char *, size_t, const char *, void *), @@ -88,7 +88,7 @@ extern "C" { /// \param[in] _callback The function to call when a message is received. /// \param[in] _userData Arbitrary user data pointer. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportSubscribeOptions(IgnTransportNode *_node, const char *_topic, SubscribeOpts _opts, void (*_callback)(const char *, size_t, const char *, void *), @@ -100,7 +100,7 @@ extern "C" { /// \param[in] _callback The function to call when a message is received. /// \param[in] _userData Arbitrary user data pointer. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportSubscribeNonConst(IgnTransportNode *_node, char *_topic, void (*_callback)(char *, size_t, char *, void *), void *_userData); @@ -109,13 +109,13 @@ extern "C" { /// \param[in] _node Pointer to a node. /// \param[in] _topic Name of the topic. /// \return 0 on success. - int IGNITION_TRANSPORT_VISIBLE + int GZ_TRANSPORT_VISIBLE ignTransportUnsubscribe(IgnTransportNode *_node, const char *_topic); /// \brief Block the current thread until a SIGINT or SIGTERM is received. /// Note that this function registers a signal handler. Do not use this /// function if you want to manage yourself SIGINT/SIGTERM. - void IGNITION_TRANSPORT_VISIBLE ignTransportWaitForShutdown(); + void GZ_TRANSPORT_VISIBLE ignTransportWaitForShutdown(); #ifdef __cplusplus } diff --git a/include/gz/transport/Clock.hh b/include/gz/transport/Clock.hh index 58b1c20c7..ee729d6bb 100644 --- a/include/gz/transport/Clock.hh +++ b/include/gz/transport/Clock.hh @@ -35,7 +35,7 @@ namespace gz // ////////////////////////////////////////////////// /// \brief A Clock interface for time tracking - class IGNITION_TRANSPORT_VISIBLE Clock + class GZ_TRANSPORT_VISIBLE Clock { /// \brief Gets clock time /// \return Current clock time, in nanoseconds @@ -53,7 +53,7 @@ namespace gz /// \brief A Clock interface implementation that uses /// gz::msgs::Clock messages distributed across /// the network - class IGNITION_TRANSPORT_VISIBLE NetworkClock : public Clock + class GZ_TRANSPORT_VISIBLE NetworkClock : public Clock { /// \brief Network clock time bases public: enum class TimeBase : int64_t @@ -96,7 +96,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief A Clock implementation that leverages host OS time APIs - class IGNITION_TRANSPORT_VISIBLE WallClock : public Clock + class GZ_TRANSPORT_VISIBLE WallClock : public Clock { /// \brief Returns system wall clock interface /// \return The sole wall clock instance (a singleton) diff --git a/include/gz/transport/Discovery.hh b/include/gz/transport/Discovery.hh index b6bd774b3..f57be6ead 100644 --- a/include/gz/transport/Discovery.hh +++ b/include/gz/transport/Discovery.hh @@ -101,7 +101,7 @@ namespace gz /// \param[in] _sockets Sockets on which to listen. /// \param[in] _timeout Length of time to poll (milliseconds). /// \return True if the sockets received a reply. - bool IGNITION_TRANSPORT_VISIBLE pollSockets( + bool GZ_TRANSPORT_VISIBLE pollSockets( const std::vector &_sockets, const int _timeout); diff --git a/include/gz/transport/Helpers.hh b/include/gz/transport/Helpers.hh index af15d267a..b300dea55 100644 --- a/include/gz/transport/Helpers.hh +++ b/include/gz/transport/Helpers.hh @@ -57,20 +57,20 @@ namespace gz /// \param[in] _name Name of the environment variable. /// \param[out] _value Value if the variable was found. /// \return True if the variable was found or false otherwise. - bool IGNITION_TRANSPORT_VISIBLE env(const std::string &_name, + bool GZ_TRANSPORT_VISIBLE env(const std::string &_name, std::string &_value); /// \brief split at a one character delimiter to get a vector of something /// \param[in] _orig The string to split /// \param[in] _delim a character to split the string at /// \returns vector of split pieces of the string excluding the delimiter - std::vector IGNITION_TRANSPORT_VISIBLE split( + std::vector GZ_TRANSPORT_VISIBLE split( const std::string &_orig, char _delim); /// \brief Portable function to get the id of the current process. /// \returns id of current process - unsigned int IGNITION_TRANSPORT_VISIBLE getProcessId(); + unsigned int GZ_TRANSPORT_VISIBLE getProcessId(); // Use safer functions on Windows #ifdef _MSC_VER diff --git a/include/gz/transport/MessageInfo.hh b/include/gz/transport/MessageInfo.hh index 8486c3a28..3458ba59a 100644 --- a/include/gz/transport/MessageInfo.hh +++ b/include/gz/transport/MessageInfo.hh @@ -34,7 +34,7 @@ namespace gz class MessageInfoPrivate; /// \brief A class that provides information about the message received. - class IGNITION_TRANSPORT_VISIBLE MessageInfo + class GZ_TRANSPORT_VISIBLE MessageInfo { /// \brief Default constructor. public: MessageInfo(); diff --git a/include/gz/transport/NetUtils.hh b/include/gz/transport/NetUtils.hh index cb2202e3d..2732ebc28 100644 --- a/include/gz/transport/NetUtils.hh +++ b/include/gz/transport/NetUtils.hh @@ -48,24 +48,24 @@ namespace gz /// Reference: https://github.com/ros/ros_comm/blob/hydro-devel/clients/ /// roscpp/src/libros/network.cpp /// \return The IP or hostname of this host. - std::string IGNITION_TRANSPORT_VISIBLE determineHost(); + std::string GZ_TRANSPORT_VISIBLE determineHost(); /// \brief Determine the list of network interfaces for this machine. /// Reference: https://github.com/ros/ros_comm/blob/hydro-devel/clients/ /// roscpp/src/libros/network.cpp /// \return The list of network interfaces. - std::vector IGNITION_TRANSPORT_VISIBLE determineInterfaces(); + std::vector GZ_TRANSPORT_VISIBLE determineInterfaces(); /// \brief Determine the computer's hostname. /// \return The computer's hostname. - std::string IGNITION_TRANSPORT_VISIBLE hostname(); + std::string GZ_TRANSPORT_VISIBLE hostname(); /// \brief Determine your login name. /// \return Name used to gain access to the computer. /// On linux and Mac only, if determination /// of your login name failes then a string of the form "error-UUID" /// is returned where UUID is a universally unique identifier. - std::string IGNITION_TRANSPORT_VISIBLE username(); + std::string GZ_TRANSPORT_VISIBLE username(); } } } diff --git a/include/gz/transport/Node.hh b/include/gz/transport/Node.hh index a241c49b0..af385ba83 100644 --- a/include/gz/transport/Node.hh +++ b/include/gz/transport/Node.hh @@ -69,7 +69,7 @@ namespace gz /// If the buffer is set to unlimited, then your buffer will grow until /// you run out of memory (and probably crash). /// If your buffer reaches the maximum capacity data will be dropped. - int IGNITION_TRANSPORT_VISIBLE rcvHwm(); + int GZ_TRANSPORT_VISIBLE rcvHwm(); /// \brief Get the capacity of the buffer (High Water Mark) /// that stores outgoing Ignition Transport messages. Note that this is a @@ -81,18 +81,18 @@ namespace gz /// If the buffer is set to unlimited, then your buffer will grow until /// you run out of memory (and probably crash). /// If your buffer reaches the maximum capacity data will be dropped. - int IGNITION_TRANSPORT_VISIBLE sndHwm(); + int GZ_TRANSPORT_VISIBLE sndHwm(); /// \brief Block the current thread until a SIGINT or SIGTERM is received. /// Note that this function registers a signal handler. Do not use this /// function if you want to manage yourself SIGINT/SIGTERM. - void IGNITION_TRANSPORT_VISIBLE waitForShutdown(); + void GZ_TRANSPORT_VISIBLE waitForShutdown(); /// \class Node Node.hh gz/transport/Node.hh /// \brief A class that allows a client to communicate with other peers. /// There are two main communication modes: pub/sub messages and service /// calls. - class IGNITION_TRANSPORT_VISIBLE Node + class GZ_TRANSPORT_VISIBLE Node { class PublisherPrivate; @@ -112,7 +112,7 @@ namespace gz /// // when publishing to interprocess subscribers. /// pub.Publish(msg); /// } - public: class IGNITION_TRANSPORT_VISIBLE Publisher + public: class GZ_TRANSPORT_VISIBLE Publisher { /// \brief Default constructor. public: Publisher(); diff --git a/include/gz/transport/NodeOptions.hh b/include/gz/transport/NodeOptions.hh index 226d4125f..1805e27a5 100644 --- a/include/gz/transport/NodeOptions.hh +++ b/include/gz/transport/NodeOptions.hh @@ -37,7 +37,7 @@ namespace gz /// \class NodeOptions NodeOptions.hh gz/transport/NodeOptions.hh /// \brief A class for customizing the behavior of the Node. /// E.g.: Set a custom namespace or a partition name. - class IGNITION_TRANSPORT_VISIBLE NodeOptions + class GZ_TRANSPORT_VISIBLE NodeOptions { /// \brief Constructor. public: NodeOptions(); diff --git a/include/gz/transport/NodeShared.hh b/include/gz/transport/NodeShared.hh index e989e9cfe..4cca1a335 100644 --- a/include/gz/transport/NodeShared.hh +++ b/include/gz/transport/NodeShared.hh @@ -63,7 +63,7 @@ namespace gz /// \class NodeShared NodeShared.hh gz/transport/NodeShared.hh /// \brief Private data for the Node class. This class should not be /// directly used. You should use the Node class. - class IGNITION_TRANSPORT_VISIBLE NodeShared + class GZ_TRANSPORT_VISIBLE NodeShared { /// \brief NodeShared is a singleton. This method gets the /// NodeShared instance shared between all the nodes. diff --git a/include/gz/transport/Publisher.hh b/include/gz/transport/Publisher.hh index f6ed57f6c..8e987e719 100644 --- a/include/gz/transport/Publisher.hh +++ b/include/gz/transport/Publisher.hh @@ -41,7 +41,7 @@ namespace gz /// gz/transport/Publisher.hh /// \brief This class stores all the information about a publisher. /// It stores the topic name that publishes, addresses, UUIDs, scope, etc. - class IGNITION_TRANSPORT_VISIBLE Publisher + class GZ_TRANSPORT_VISIBLE Publisher { /// \brief Default constructor. public: Publisher() = default; @@ -178,7 +178,7 @@ namespace gz /// \class MessagePublisher Publisher.hh /// gz/transport/Publisher.hh /// \brief This class stores all the information about a message publisher. - class IGNITION_TRANSPORT_VISIBLE MessagePublisher : public Publisher + class GZ_TRANSPORT_VISIBLE MessagePublisher : public Publisher { /// \brief Default constructor. public: MessagePublisher() = default; @@ -293,7 +293,7 @@ namespace gz /// \class ServicePublisher Publisher.hh /// gz/transport/Publisher.hh /// \brief This class stores all the information about a service publisher. - class IGNITION_TRANSPORT_VISIBLE ServicePublisher : public Publisher + class GZ_TRANSPORT_VISIBLE ServicePublisher : public Publisher { /// \brief Default constructor. public: ServicePublisher() = default; diff --git a/include/gz/transport/RepHandler.hh b/include/gz/transport/RepHandler.hh index bba2698a1..510b3c6cb 100644 --- a/include/gz/transport/RepHandler.hh +++ b/include/gz/transport/RepHandler.hh @@ -49,7 +49,7 @@ namespace gz // /// \class IRepHandler RepHandler.hh gz/transport/RepHandler.hh /// \brief Interface class used to manage a replier handler. - class IGNITION_TRANSPORT_VISIBLE IRepHandler + class GZ_TRANSPORT_VISIBLE IRepHandler { /// \brief Constructor. public: IRepHandler() diff --git a/include/gz/transport/ReqHandler.hh b/include/gz/transport/ReqHandler.hh index f9dc364f4..82051bac1 100644 --- a/include/gz/transport/ReqHandler.hh +++ b/include/gz/transport/ReqHandler.hh @@ -45,7 +45,7 @@ namespace gz // /// \class IReqHandler ReqHandler.hh gz/transport/ReqHandler.hh /// \brief Interface class used to manage a request handler. - class IGNITION_TRANSPORT_VISIBLE IReqHandler + class GZ_TRANSPORT_VISIBLE IReqHandler { /// \brief Constructor. /// \param[in] _nUuid UUID of the node registering the request handler. diff --git a/include/gz/transport/SubscribeOptions.hh b/include/gz/transport/SubscribeOptions.hh index 308a3db3d..72cd78e66 100644 --- a/include/gz/transport/SubscribeOptions.hh +++ b/include/gz/transport/SubscribeOptions.hh @@ -36,7 +36,7 @@ namespace gz /// \class SubscribeOptions SubscribeOptions.hh /// gz/transport/SubscribeOptions.hh /// \brief A class to provide different options for a subscription. - class IGNITION_TRANSPORT_VISIBLE SubscribeOptions + class GZ_TRANSPORT_VISIBLE SubscribeOptions { /// \brief Constructor. public: SubscribeOptions(); diff --git a/include/gz/transport/SubscriptionHandler.hh b/include/gz/transport/SubscriptionHandler.hh index 085edf949..ebc8df90e 100644 --- a/include/gz/transport/SubscriptionHandler.hh +++ b/include/gz/transport/SubscriptionHandler.hh @@ -56,7 +56,7 @@ namespace gz // /// \brief SubscriptionHandlerBase contains functions and data which are /// common to all SubscriptionHandler types. - class IGNITION_TRANSPORT_VISIBLE SubscriptionHandlerBase + class GZ_TRANSPORT_VISIBLE SubscriptionHandlerBase { /// \brief Constructor. /// \param[in] _nUuid UUID of the node registering the handler. @@ -120,7 +120,7 @@ namespace gz /// deserializing protobuf message data, and for receiving deserialized /// messages. Those functions are not needed by the RawSubscriptionHandler /// class. - class IGNITION_TRANSPORT_VISIBLE ISubscriptionHandler + class GZ_TRANSPORT_VISIBLE ISubscriptionHandler : public SubscriptionHandlerBase { /// \brief Constructor. diff --git a/include/gz/transport/TopicStatistics.hh b/include/gz/transport/TopicStatistics.hh index 94b5ccdf5..825260bc3 100644 --- a/include/gz/transport/TopicStatistics.hh +++ b/include/gz/transport/TopicStatistics.hh @@ -49,7 +49,7 @@ namespace gz /// \brief Computes the rolling average, min, max, and standard /// deviation for a set of samples. - class IGNITION_TRANSPORT_VISIBLE Statistics + class GZ_TRANSPORT_VISIBLE Statistics { /// \brief Default constructor. public: Statistics() = default; @@ -110,7 +110,7 @@ namespace gz /// Publication statistics utilize time stamps generated by the /// publisher. Receive statistics use time stamps generated by the /// subscriber. - class IGNITION_TRANSPORT_VISIBLE TopicStatistics + class GZ_TRANSPORT_VISIBLE TopicStatistics { /// \brief Default constructor. public: TopicStatistics(); diff --git a/include/gz/transport/TopicUtils.hh b/include/gz/transport/TopicUtils.hh index d5f5968de..10c3e63f4 100644 --- a/include/gz/transport/TopicUtils.hh +++ b/include/gz/transport/TopicUtils.hh @@ -33,7 +33,7 @@ namespace gz // /// \class TopicUtils TopicUtils.hh gz/transport/TopicUtils.hh /// \brief This class provides different utilities related with topics. - class IGNITION_TRANSPORT_VISIBLE TopicUtils + class GZ_TRANSPORT_VISIBLE TopicUtils { /// \brief Determines if a namespace is valid. A namespace's length must /// not exceed kMaxNameLength. diff --git a/include/gz/transport/Uuid.hh b/include/gz/transport/Uuid.hh index 5ce2bf358..42001f751 100644 --- a/include/gz/transport/Uuid.hh +++ b/include/gz/transport/Uuid.hh @@ -42,7 +42,7 @@ namespace gz // /// \class Uuid Uuid.hh gz/transport/Uuid.hh /// \brief A portable class for representing a Universally Unique Identifier - class IGNITION_TRANSPORT_VISIBLE Uuid + class GZ_TRANSPORT_VISIBLE Uuid { /// \brief Constructor. public: Uuid(); diff --git a/log/include/gz/transport/log/Batch.hh b/log/include/gz/transport/log/Batch.hh index 6d679a26f..8578e323d 100644 --- a/log/include/gz/transport/log/Batch.hh +++ b/log/include/gz/transport/log/Batch.hh @@ -38,7 +38,7 @@ namespace gz class Log; /// \brief Holds the result of a query for messages - class IGNITION_TRANSPORT_LOG_VISIBLE Batch + class GZ_TRANSPORT_LOG_VISIBLE Batch { /// \brief Default constructor public: Batch(); diff --git a/log/include/gz/transport/log/Descriptor.hh b/log/include/gz/transport/log/Descriptor.hh index 5237941d0..36a272c1c 100644 --- a/log/include/gz/transport/log/Descriptor.hh +++ b/log/include/gz/transport/log/Descriptor.hh @@ -42,7 +42,7 @@ namespace gz /// \brief The Descriptor class provides meta-information about what a log /// contains. This may be useful for determining QueryOptions or for /// generating a high-level overview of a Log's contents. - class IGNITION_TRANSPORT_LOG_VISIBLE Descriptor + class GZ_TRANSPORT_LOG_VISIBLE Descriptor { /// \brief A map from a name (e.g. topic name or message type name) to /// the id of a row in one of the database tables. (name -> id) diff --git a/log/include/gz/transport/log/Log.hh b/log/include/gz/transport/log/Log.hh index 57c3c7413..20639024e 100644 --- a/log/include/gz/transport/log/Log.hh +++ b/log/include/gz/transport/log/Log.hh @@ -42,7 +42,7 @@ namespace gz const std::string SchemaLocationEnvVar = "IGN_TRANSPORT_LOG_SQL_PATH"; /// \brief Interface to a log file - class IGNITION_TRANSPORT_LOG_VISIBLE Log + class GZ_TRANSPORT_LOG_VISIBLE Log { /// \brief constructor public: Log(); diff --git a/log/include/gz/transport/log/Message.hh b/log/include/gz/transport/log/Message.hh index bf7b4a4e2..273e3e5e1 100644 --- a/log/include/gz/transport/log/Message.hh +++ b/log/include/gz/transport/log/Message.hh @@ -37,7 +37,7 @@ namespace gz class MessagePrivate; /// \brief Represents a message in a bag file. - class IGNITION_TRANSPORT_LOG_VISIBLE Message + class GZ_TRANSPORT_LOG_VISIBLE Message { /// \brief Default constructor public: Message(); diff --git a/log/include/gz/transport/log/MsgIter.hh b/log/include/gz/transport/log/MsgIter.hh index 7c772d598..356973330 100644 --- a/log/include/gz/transport/log/MsgIter.hh +++ b/log/include/gz/transport/log/MsgIter.hh @@ -38,7 +38,7 @@ namespace gz class Log; /// \brief Implements iterator for reading messages - class IGNITION_TRANSPORT_LOG_VISIBLE MsgIter + class GZ_TRANSPORT_LOG_VISIBLE MsgIter { /// \brief Default constructor public: MsgIter(); diff --git a/log/include/gz/transport/log/Playback.hh b/log/include/gz/transport/log/Playback.hh index a4f8ae40b..f3e240e8d 100644 --- a/log/include/gz/transport/log/Playback.hh +++ b/log/include/gz/transport/log/Playback.hh @@ -44,7 +44,7 @@ namespace gz /// This class makes it easy to play topics from a log file /// /// Responsibilities: topic name matching and initiating the playback - class IGNITION_TRANSPORT_LOG_VISIBLE Playback + class GZ_TRANSPORT_LOG_VISIBLE Playback { /// \brief Constructor /// \param[in] _file path to log file @@ -160,7 +160,7 @@ namespace gz /// /// Responsibilities: time keeping, multiple thread safety, publishing /// data to topics, and stopping playback. - class IGNITION_TRANSPORT_LOG_VISIBLE PlaybackHandle + class GZ_TRANSPORT_LOG_VISIBLE PlaybackHandle { /// \brief Stop playing messages public: void Stop(); diff --git a/log/include/gz/transport/log/QualifiedTime.hh b/log/include/gz/transport/log/QualifiedTime.hh index 4914a3bc3..74cb7a36d 100644 --- a/log/include/gz/transport/log/QualifiedTime.hh +++ b/log/include/gz/transport/log/QualifiedTime.hh @@ -41,7 +41,7 @@ namespace gz /// Note that the value of this time object may be interpreted as a /// relative time or as an absolute time stamp depending on the context in /// which it gets used. - class IGNITION_TRANSPORT_LOG_VISIBLE QualifiedTime + class GZ_TRANSPORT_LOG_VISIBLE QualifiedTime { /// \brief The Qualifier determines the behavior of how a message is /// selected. @@ -190,7 +190,7 @@ namespace gz /// \brief The QualifiedTimeRange class provides a pair of qualified times /// that represent a range. This is used to specify a desired time range /// to the BasicQueryOptions class. - class IGNITION_TRANSPORT_LOG_VISIBLE QualifiedTimeRange + class GZ_TRANSPORT_LOG_VISIBLE QualifiedTimeRange { /// \brief Construct a time range. /// \param[in] _begin The beginning of the time range. diff --git a/log/include/gz/transport/log/QueryOptions.hh b/log/include/gz/transport/log/QueryOptions.hh index b8a1ac47f..a4ae3a582 100644 --- a/log/include/gz/transport/log/QueryOptions.hh +++ b/log/include/gz/transport/log/QueryOptions.hh @@ -42,7 +42,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief The QueryOptions interface is used by Log::QueryMessages() to /// determine which messages are retrieved from the log file. - class IGNITION_TRANSPORT_LOG_VISIBLE QueryOptions + class GZ_TRANSPORT_LOG_VISIBLE QueryOptions { /// \brief Generate one or more SQL query statements to be used by the /// log file to produce a Batch of messages. @@ -80,7 +80,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief Base class which manages the time range settings for the native /// QueryOptions classes. - class IGNITION_TRANSPORT_LOG_VISIBLE TimeRangeOption + class GZ_TRANSPORT_LOG_VISIBLE TimeRangeOption { /// \brief Constructor that sets the initial time range option. /// \param[in] _timeRange The time range. @@ -131,7 +131,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief Specify a list of topics to query. - class IGNITION_TRANSPORT_LOG_VISIBLE TopicList final + class GZ_TRANSPORT_LOG_VISIBLE TopicList final : public virtual QueryOptions, public virtual TimeRangeOption { @@ -204,7 +204,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief Specify a pattern of topics to query. - class IGNITION_TRANSPORT_LOG_VISIBLE TopicPattern final + class GZ_TRANSPORT_LOG_VISIBLE TopicPattern final : public virtual QueryOptions, public virtual TimeRangeOption { @@ -259,7 +259,7 @@ namespace gz ////////////////////////////////////////////////// /// \brief Query for all the topics. - class IGNITION_TRANSPORT_LOG_VISIBLE AllTopics final + class GZ_TRANSPORT_LOG_VISIBLE AllTopics final : public virtual QueryOptions, public virtual TimeRangeOption { diff --git a/log/include/gz/transport/log/Recorder.hh b/log/include/gz/transport/log/Recorder.hh index ba1d3ec32..982d906bc 100644 --- a/log/include/gz/transport/log/Recorder.hh +++ b/log/include/gz/transport/log/Recorder.hh @@ -51,7 +51,7 @@ namespace gz /// This class makes it easy to record topics to a log file. /// Responsibilities: topic name matching, time received tracking, /// multiple thread safety, subscribing to topics - class IGNITION_TRANSPORT_LOG_VISIBLE Recorder + class GZ_TRANSPORT_LOG_VISIBLE Recorder { /// \brief Default constructor public: Recorder(); diff --git a/log/include/gz/transport/log/SqlStatement.hh b/log/include/gz/transport/log/SqlStatement.hh index 55ccda1f1..02be7ba31 100644 --- a/log/include/gz/transport/log/SqlStatement.hh +++ b/log/include/gz/transport/log/SqlStatement.hh @@ -41,7 +41,7 @@ namespace gz /// /// These parameter types map directly to the datatypes of SQLite3: /// https://www.sqlite.org/datatype3.html - class IGNITION_TRANSPORT_LOG_VISIBLE SqlParameter + class GZ_TRANSPORT_LOG_VISIBLE SqlParameter { /// \brief An enum to indicate which type of parameter this is. public: enum class ParamType : int @@ -150,7 +150,7 @@ namespace gz /// \brief A statement for a SQL query. These are generated by the /// QueryOptions class to control how messages get queried from the log. - struct IGNITION_TRANSPORT_LOG_VISIBLE SqlStatement + struct GZ_TRANSPORT_LOG_VISIBLE SqlStatement { #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/log/src/Descriptor.hh b/log/src/Descriptor.hh index e0c223fd0..63b38cc54 100644 --- a/log/src/Descriptor.hh +++ b/log/src/Descriptor.hh @@ -36,7 +36,7 @@ namespace gz /// \brief A representation of the information that defines a topic row /// \note We export the symbols for this class so it can be used in /// UNIT_Descriptor_TEST - struct IGNITION_TRANSPORT_LOG_VISIBLE TopicKey + struct GZ_TRANSPORT_LOG_VISIBLE TopicKey { #ifdef _WIN32 // Disable warning C4251 which is triggered by @@ -70,7 +70,7 @@ namespace gz /// \brief Implementation of the Descriptor class /// \note We export the symbols for this class so it can be used in /// UNIT_Descriptor_TEST - class IGNITION_TRANSPORT_LOG_VISIBLE Descriptor::Implementation + class GZ_TRANSPORT_LOG_VISIBLE Descriptor::Implementation { /// \internal Reset this descriptor. This should only be called by the /// Log class, when it is generating a new Descriptor after opening a diff --git a/log/src/cmd/LogCommandAPI.hh b/log/src/cmd/LogCommandAPI.hh index 7fc17f16a..1921f5044 100644 --- a/log/src/cmd/LogCommandAPI.hh +++ b/log/src/cmd/LogCommandAPI.hh @@ -31,12 +31,12 @@ extern "C" /// \brief Sets verbosity of library /// \param[in] _level [0-4] Verbosity level - int IGNITION_TRANSPORT_LOG_VISIBLE verbosity(int _level); + int GZ_TRANSPORT_LOG_VISIBLE verbosity(int _level); /// \brief Record topics whose name matches the given pattern /// \param[in] _file Path to the log file to record /// \param[in] _pattern ECMAScript regular expression to match against topics - int IGNITION_TRANSPORT_LOG_VISIBLE recordTopics( + int GZ_TRANSPORT_LOG_VISIBLE recordTopics( const char *_file, const char *_pattern); @@ -46,7 +46,7 @@ extern "C" /// \param[in] _wait_ms How long to wait before the publications begin after /// advertising the topics that will be played back (milliseconds) /// \param[in] _fast Set to > 0 to disable wait between messages. - int IGNITION_TRANSPORT_LOG_VISIBLE playbackTopics( + int GZ_TRANSPORT_LOG_VISIBLE playbackTopics( const char *_file, const char *_pattern, const int _wait_ms, diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc index ac0632934..00ba6dca7 100644 --- a/test/integration/deprecated_TEST.cc +++ b/test/integration/deprecated_TEST.cc @@ -28,3 +28,5 @@ TEST(Deprecated, IgnitionNamespace) { ignition::transport::Clock clock; } + +#undef SUPPRESS_IGNITION_HEADER_DEPRECATION