Combine package name with message namespace

Signed-off-by: Jacob Perron <[email protected]>
ros2 · May 2, 2019 · 6d6464d · 6d6464d
1 parent a01e10e
commit 6d6464d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/rmw_fastrtps_cpp/src/type_support_common.hpp b/rmw_fastrtps_cpp/src/type_support_common.hpp
@@ -51,12 +51,7 @@ _create_type_name(
     return "";
   }
   std::ostringstream ss;
-  ss << members->package_name_
-     << "::"
-     << members->message_namespace_
-     << "::dds_::"
-     << members->message_name_
-     << "_";
+  ss << members->message_namespace_ << "::dds_::" << members->message_name_ << "_";
   return ss.str();
 }
 

diff --git a/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/MessageTypeSupport_impl.hpp b/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/MessageTypeSupport_impl.hpp
@@ -34,8 +34,8 @@ MessageTypeSupport<MembersType>::MessageTypeSupport(const MembersType * members)
   assert(members);
   this->members_ = members;
 
-  std::string name = std::string(this->members_->package_name_) + "::" +
-    this->members_->message_namespace_ + "::dds_::" + this->members_->message_name_ + "_";
+  std::string name = std::string(this->members_->message_namespace_) + "::dds_::" +
+    this->members_->message_name_ + "_";
   this->setName(name.c_str());
 
   // Fully bound by default

diff --git a/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/ServiceTypeSupport_impl.hpp b/rmw_fastrtps_dynamic_cpp/include/rmw_fastrtps_dynamic_cpp/ServiceTypeSupport_impl.hpp
@@ -38,8 +38,8 @@ RequestTypeSupport<ServiceMembersType, MessageMembersType>::RequestTypeSupport(
   assert(members);
   this->members_ = members->request_members_;
 
-  std::string name = std::string(this->members_->package_name_) + "::" +
-    this->members_->message_namespace_ + "::dds_::" + this->members_->message_name_ + "_";
+  std::string name = std::string(this->members_->message_namespace_) + "::dds_::" +
+    this->members_->message_name_ + "_";
   this->setName(name.c_str());
 
   // Fully bound by default
@@ -60,8 +60,8 @@ ResponseTypeSupport<ServiceMembersType, MessageMembersType>::ResponseTypeSupport
   assert(members);
   this->members_ = members->response_members_;
 
-  std::string name = std::string(this->members_->package_name_) + "::" +
-    this->members_->message_namespace_ + "::dds_::" + this->members_->message_name_ + "_";
+  std::string name = std::string(this->members_->message_namespace_) + "::dds_::" +
+    this->members_->message_name_ + "_";
   this->setName(name.c_str());
 
   // Fully bound by default

diff --git a/rmw_fastrtps_dynamic_cpp/src/type_support_common.hpp b/rmw_fastrtps_dynamic_cpp/src/type_support_common.hpp
@@ -81,12 +81,7 @@ _create_type_name(
     return "";
   }
   std::ostringstream ss;
-  ss << members->package_name_
-     << "::"
-     << members->message_namespace_
-     << "::dds_::"
-     << members->message_name_
-     << "_";
+  ss << members->message_namespace_ << "::dds_::" << members->message_name_ << "_";
   return ss.str();
 }
 

diff --git a/rmw_fastrtps_shared_cpp/src/demangle.cpp b/rmw_fastrtps_shared_cpp/src/demangle.cpp
@@ -34,7 +34,7 @@ _demangle_if_ros_topic(const std::string & topic_name)
 std::string
 _demangle_if_ros_type(const std::string & dds_type_string)
 {
-  std::regex dds_namespace_pattern("[^:]+((::.+::)+dds_::).*");
+  std::regex dds_namespace_pattern("[^:]*((::.+::)*dds_::).*");
   std::smatch match;
   if (
     dds_type_string[dds_type_string.size() - 1] != '_' ||