Merge pull request #250 from ros2/support_static_lib

remove duplicate namespace_prefix symbols
ros2 · Jan 3, 2019 · 328771c · 328771c
2 parents 8cf6e3e + 21291ad
commit 328771c
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 207 deletions.
diff --git a/rmw_fastrtps_cpp/CMakeLists.txt b/rmw_fastrtps_cpp/CMakeLists.txt
@@ -53,7 +53,6 @@ add_library(rmw_fastrtps_cpp
  src/get_service.cpp
  src/get_subscriber.cpp
  src/identifier.cpp
- src/namespace_prefix.cpp
  src/qos.cpp
  src/rmw_logging.cpp
  src/rmw_client.cpp

diff --git a/rmw_fastrtps_cpp/src/namespace_prefix.cpp b/rmw_fastrtps_cpp/src/namespace_prefix.cpp
diff --git a/rmw_fastrtps_cpp/src/namespace_prefix.hpp b/rmw_fastrtps_cpp/src/namespace_prefix.hpp
diff --git a/rmw_fastrtps_cpp/src/rmw_client.cpp b/rmw_fastrtps_cpp/src/rmw_client.cpp
@@ -21,11 +21,11 @@
 
 #include "rmw_fastrtps_shared_cpp/custom_client_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 
 #include "rmw_fastrtps_cpp/identifier.hpp"
 
-#include "./namespace_prefix.hpp"
 #include "./qos.hpp"
 #include "./type_support_common.hpp"
 

diff --git a/rmw_fastrtps_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_cpp/src/rmw_publisher.cpp
@@ -21,10 +21,10 @@
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_publisher_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 #include "rmw_fastrtps_cpp/identifier.hpp"
 
-#include "./namespace_prefix.hpp"
 #include "./qos.hpp"
 #include "./type_support_common.hpp"
 

diff --git a/rmw_fastrtps_cpp/src/rmw_service.cpp b/rmw_fastrtps_cpp/src/rmw_service.cpp
@@ -33,11 +33,11 @@
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_service_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 #include "rmw_fastrtps_cpp/identifier.hpp"
 
 #include "./type_support_common.hpp"
-#include "./namespace_prefix.hpp"
 #include "./qos.hpp"
 
 using Domain = eprosima::fastrtps::Domain;

diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -22,13 +22,13 @@
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 #include "fastrtps/participant/Participant.h"
 #include "fastrtps/subscriber/Subscriber.h"
 
 #include "rmw_fastrtps_cpp/identifier.hpp"
 
-#include "./namespace_prefix.hpp"
 #include "./qos.hpp"
 #include "./type_support_common.hpp"
 

diff --git a/rmw_fastrtps_dynamic_cpp/CMakeLists.txt b/rmw_fastrtps_dynamic_cpp/CMakeLists.txt
@@ -54,7 +54,6 @@ add_library(rmw_fastrtps_dynamic_cpp
  src/get_service.cpp
  src/get_subscriber.cpp
  src/identifier.cpp
- src/namespace_prefix.cpp
  src/qos.cpp
  src/rmw_logging.cpp
  src/rmw_client.cpp

diff --git a/rmw_fastrtps_dynamic_cpp/src/namespace_prefix.cpp b/rmw_fastrtps_dynamic_cpp/src/namespace_prefix.cpp
diff --git a/rmw_fastrtps_dynamic_cpp/src/namespace_prefix.hpp b/rmw_fastrtps_dynamic_cpp/src/namespace_prefix.hpp
diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_client.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_client.cpp
@@ -25,11 +25,11 @@
 
 #include "client_service_common.hpp"
 #include "rmw_fastrtps_dynamic_cpp/identifier.hpp"
-#include "namespace_prefix.hpp"
 #include "qos.hpp"
 #include "type_support_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_client_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 
 using Domain = eprosima::fastrtps::Domain;

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp
@@ -21,9 +21,9 @@
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_publisher_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 #include "rmw_fastrtps_dynamic_cpp/identifier.hpp"
-#include "namespace_prefix.hpp"
 #include "qos.hpp"
 #include "type_support_common.hpp"
 

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_service.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_service.cpp
@@ -38,10 +38,10 @@
 #include "type_support_common.hpp"
 #include "client_service_common.hpp"
 #include "rmw_fastrtps_dynamic_cpp/identifier.hpp"
-#include "namespace_prefix.hpp"
 #include "qos.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_service_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 using Domain = eprosima::fastrtps::Domain;
 using Participant = eprosima::fastrtps::Participant;

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp
@@ -22,13 +22,13 @@
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_subscriber_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 #include "fastrtps/participant/Participant.h"
 #include "fastrtps/subscriber/Subscriber.h"
 
 #include "rmw_fastrtps_dynamic_cpp/identifier.hpp"
 
-#include "namespace_prefix.hpp"
 #include "qos.hpp"
 #include "type_support_common.hpp"
 

diff --git a/...trtps_shared_cpp/src/namespace_prefix.hpp → ..._fastrtps_shared_cpp/namespace_prefix.hpp b/...trtps_shared_cpp/src/namespace_prefix.hpp → ..._fastrtps_shared_cpp/namespace_prefix.hpp
@@ -12,19 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef NAMESPACE_PREFIX_HPP_
-#define NAMESPACE_PREFIX_HPP_
+#ifndef RMW_FASTRTPS_SHARED_CPP__NAMESPACE_PREFIX_HPP_
+#define RMW_FASTRTPS_SHARED_CPP__NAMESPACE_PREFIX_HPP_
 
 #include <vector>
 #include <string>
 
+#include "rmw_fastrtps_shared_cpp/visibility_control.h"
+
 extern "C"
 {
-extern const char * const ros_topic_prefix;
-extern const char * const ros_service_requester_prefix;
-extern const char * const ros_service_response_prefix;
+RMW_FASTRTPS_SHARED_CPP_PUBLIC extern const char * const ros_topic_prefix;
+RMW_FASTRTPS_SHARED_CPP_PUBLIC extern const char * const ros_service_requester_prefix;
+RMW_FASTRTPS_SHARED_CPP_PUBLIC extern const char * const ros_service_response_prefix;
 
-extern const std::vector<std::string> _ros_prefixes;
+RMW_FASTRTPS_SHARED_CPP_PUBLIC extern const std::vector<std::string> _ros_prefixes;
 } // extern "C"
 
 /// Return the ROS specific prefix if it exists, otherwise "".
@@ -38,4 +40,4 @@ _strip_ros_prefix_if_exists(const std::string & topic_name);
 /// Returns the list of ros prefixes
 const std::vector<std::string> &
 _get_all_ros_prefixes();
-#endif // NAMESPACE_PREFIX_HPP_
+#endif // RMW_FASTRTPS_SHARED_CPP__NAMESPACE_PREFIX_HPP_
diff --git a/rmw_fastrtps_shared_cpp/src/demangle.cpp b/rmw_fastrtps_shared_cpp/src/demangle.cpp
@@ -19,7 +19,7 @@
 #include "rcutils/logging_macros.h"
 #include "rcutils/types.h"
 
-#include "namespace_prefix.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 /// Return the demangle ROS topic or the original if not a ROS topic.
 std::string

diff --git a/rmw_fastrtps_shared_cpp/src/namespace_prefix.cpp b/rmw_fastrtps_shared_cpp/src/namespace_prefix.cpp
@@ -15,11 +15,10 @@
 #include <string>
 #include <vector>
 
-#include "namespace_prefix.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 
 extern "C"
 {
-// static for internal linkage
 const char * const ros_topic_prefix = "rt";
 const char * const ros_service_requester_prefix = "rq";
 const char * const ros_service_response_prefix = "rr";

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_client.cpp b/rmw_fastrtps_shared_cpp/src/rmw_client.cpp
@@ -19,10 +19,10 @@
 #include "rmw/allocators.h"
 #include "rmw/rmw.h"
 
-#include "namespace_prefix.hpp"
 #include "qos.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_client_info.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/TypeSupport.hpp"
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_count.cpp b/rmw_fastrtps_shared_cpp/src/rmw_count.cpp
@@ -25,8 +25,8 @@
 #include "rmw/types.h"
 
 #include "demangle.hpp"
-#include "namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 
 namespace rmw_fastrtps_shared_cpp

diff --git a/rmw_fastrtps_shared_cpp/src/rmw_node_info_and_types.cpp b/rmw_fastrtps_shared_cpp/src/rmw_node_info_and_types.cpp
@@ -33,8 +33,8 @@
 #include "rmw/rmw.h"
 
 #include "demangle.hpp"
-#include "namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/custom_participant_info.hpp"
+#include "rmw_fastrtps_shared_cpp/namespace_prefix.hpp"
 #include "rmw_fastrtps_shared_cpp/rmw_common.hpp"
 
 #include "rmw_fastrtps_shared_cpp/topic_cache.hpp"