Move Windows visibility macros to header files

Signed-off-by: Audrow Nash <audrow.nash@gmail.com>
ros2 · May 7, 2021 · 9de7a97 · 9de7a97
1 parent fe2ea9c
commit 9de7a97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/..._default_plugins/include/rviz_default_plugins/displays/image/get_transport_from_topic.hpp b/..._default_plugins/include/rviz_default_plugins/displays/image/get_transport_from_topic.hpp
@@ -32,13 +32,17 @@
 
 #include <string>
 
+#include "rviz_default_plugins/visibility_control.hpp"
+
 namespace rviz_default_plugins
 {
 namespace displays
 {
 
+RVIZ_DEFAULT_PLUGINS_PUBLIC
 std::string getTransportFromTopic(const std::string & topic);
 
+RVIZ_DEFAULT_PLUGINS_PUBLIC
 std::string getBaseTopicFromTopic(const std::string & topic);
 
 

diff --git a/rviz_default_plugins/src/rviz_default_plugins/displays/image/get_transport_from_topic.cpp b/rviz_default_plugins/src/rviz_default_plugins/displays/image/get_transport_from_topic.cpp
@@ -30,7 +30,6 @@
 #include <string>
 
 #include "rviz_default_plugins/displays/image/get_transport_from_topic.hpp"
-#include "rviz_default_plugins/visibility_control.hpp"
 
 namespace rviz_default_plugins
 {
@@ -44,7 +43,6 @@ bool isRawTransport(const std::string & topic)
          last_subtopic != "theora";
 }
 
-RVIZ_DEFAULT_PLUGINS_PUBLIC
 std::string getTransportFromTopic(const std::string & topic)
 {
   if (isRawTransport(topic)) {
@@ -53,8 +51,6 @@ std::string getTransportFromTopic(const std::string & topic)
   return topic.substr(topic.find_last_of('/') + 1);
 }
 
-
-RVIZ_DEFAULT_PLUGINS_PUBLIC
 std::string getBaseTopicFromTopic(const std::string & topic)
 {
   if (isRawTransport(topic)) {