Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove duplicate namespace_prefix symbols #250

Merged
merged 2 commits into from
Jan 3, 2019
Merged

remove duplicate namespace_prefix symbols #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
628088c
make namespace_prefix header public
dirk-thomas Dec 27, 2018
21291ad
use namespace_prefix from shared package
dirk-thomas Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rmw_fastrtps_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 0 additions & 53 deletions rmw_fastrtps_cpp/src/namespace_prefix.cpp
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions rmw_fastrtps_cpp/src/namespace_prefix.hpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rmw_fastrtps_cpp/src/rmw_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_cpp/src/rmw_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_cpp/src/rmw_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_cpp/src/rmw_subscription.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion rmw_fastrtps_dynamic_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 0 additions & 53 deletions rmw_fastrtps_dynamic_cpp/src/namespace_prefix.cpp
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions rmw_fastrtps_dynamic_cpp/src/namespace_prefix.hpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rmw_fastrtps_dynamic_cpp/src/rmw_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_dynamic_cpp/src/rmw_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_dynamic_cpp/src/rmw_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
16 changes: 9 additions & 7 deletions ...trtps_shared_cpp/src/namespace_prefix.hpp → ..._fastrtps_shared_cpp/namespace_prefix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "".
Expand All @@ -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_
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/src/demangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions rmw_fastrtps_shared_cpp/src/namespace_prefix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/src/rmw_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/src/rmw_count.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/src/rmw_node_info_and_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading