Skip to content

Commit

Permalink
Fix dll linkage.
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
MiguelCompany committed Sep 8, 2024
1 parent 3dfbcb2 commit 0d935da
Show file tree
Hide file tree
Showing 18 changed files with 182 additions and 182 deletions.
2 changes: 1 addition & 1 deletion rmw_fastrtps_shared_cpp/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GENERATE_LATEX = NO
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
PREDEFINED = RMW_FASTDDS_SHARED_CPP_PUBLIC=
PREDEFINED = RMW_FASTRTPS_SHARED_CPP_PUBLIC=

# Tag files that do not exist will produce a warning and cross-project linking will not work.
TAGFILES += "../../../../doxygen_tag_files/cppreference-doxygen-web.tag.xml=http://en.cppreference.com/w/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class TypeSupport : public eprosima::fastdds::dds::TopicDataType
virtual bool deserializeROSmessage(
eprosima::fastcdr::Cdr & deser, void * ros_message, const void * impl) const = 0;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
bool compute_key(
const void * const data,
eprosima::fastdds::rtps::InstanceHandle_t & ihandle,
Expand All @@ -70,7 +70,7 @@ class TypeSupport : public eprosima::fastdds::dds::TopicDataType
return false;
}

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
bool compute_key(
eprosima::fastdds::rtps::SerializedPayload_t & data,
eprosima::fastdds::rtps::InstanceHandle_t & ihandle,
Expand All @@ -80,28 +80,28 @@ class TypeSupport : public eprosima::fastdds::dds::TopicDataType
return false;
}

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
bool serialize(
const void * const data,
eprosima::fastdds::rtps::SerializedPayload_t & payload,
eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
bool deserialize(eprosima::fastdds::rtps::SerializedPayload_t & payload, void * data) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
uint32_t calculate_serialized_size(
const void * const data,
eprosima::fastdds::dds::DataRepresentationId_t data_representation)
override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void * create_data() override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void delete_data(void * data) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
inline bool is_bounded() const
#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
override
Expand All @@ -110,25 +110,25 @@ class TypeSupport : public eprosima::fastdds::dds::TopicDataType
return max_size_bound_;
}

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
inline bool is_plain(eprosima::fastdds::dds::DataRepresentationId_t rep) const override
{
return is_plain_ && rep == eprosima::fastdds::dds::XCDR_DATA_REPRESENTATION;
}

RMW_FASTDDS_SHARED_CPP_PUBLIC void register_type_object_representation() override;
RMW_FASTRTPS_SHARED_CPP_PUBLIC void register_type_object_representation() override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
inline const rosidl_message_type_support_t * ros_message_type_supports() const
{
return type_supports_;
}

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
virtual ~TypeSupport() {}

protected:
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
TypeSupport(
const rosidl_message_type_support_t * type_supports
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
namespace rmw_fastrtps_shared_cpp
{

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
rmw_gid_t
create_rmw_gid(const char * identifier, const eprosima::fastdds::rtps::GUID_t & guid);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ enum class publishing_mode_t
class CustomTopicListener final : public eprosima::fastdds::dds::TopicListener
{
public:
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
explicit CustomTopicListener(EventListenerInterface * event_listener);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void
on_inconsistent_topic(
eprosima::fastdds::dds::Topic * topic,
eprosima::fastdds::dds::InconsistentTopicStatus status) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void add_event_listener(EventListenerInterface * event_listener);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void remove_event_listener(EventListenerInterface * event_listener);

private:
Expand Down Expand Up @@ -117,14 +117,14 @@ typedef struct CustomParticipantInfo
bool leave_middleware_default_qos;
publishing_mode_t publishing_mode;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
eprosima::fastdds::dds::Topic * find_or_create_topic(
const std::string & topic_name,
const std::string & type_name,
const eprosima::fastdds::dds::TopicQos & topic_qos,
EventListenerInterface * event_listener);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void delete_topic(
const eprosima::fastdds::dds::Topic * topic,
EventListenerInterface * event_listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,28 @@ class RMWPublisherEvent;
class CustomDataWriterListener final : public eprosima::fastdds::dds::DataWriterListener
{
public:
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
explicit CustomDataWriterListener(RMWPublisherEvent * pub_event);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void
on_publication_matched(
eprosima::fastdds::dds::DataWriter * writer,
const eprosima::fastdds::dds::PublicationMatchedStatus & status) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void
on_offered_deadline_missed(
eprosima::fastdds::dds::DataWriter * writer,
const eprosima::fastdds::dds::OfferedDeadlineMissedStatus & status) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void
on_liveliness_lost(
eprosima::fastdds::dds::DataWriter * writer,
const eprosima::fastdds::dds::LivelinessLostStatus & status) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void
on_offered_incompatible_qos(
eprosima::fastdds::dds::DataWriter *,
Expand All @@ -86,32 +86,32 @@ typedef struct CustomPublisherInfo : public CustomEventInfo

eprosima::fastdds::dds::Topic * topic_{nullptr};

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
EventListenerInterface *
get_listener() const final;
} CustomPublisherInfo;

class RMWPublisherEvent final : public EventListenerInterface
{
public:
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
explicit RMWPublisherEvent(CustomPublisherInfo * info);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
eprosima::fastdds::dds::StatusCondition & get_statuscondition() const override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
bool take_event(
rmw_event_type_t event_type,
void * event_info) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void set_on_new_event_callback(
rmw_event_type_t event_type,
const void * user_data,
rmw_event_callback_t callback) override;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void update_inconsistent_topic(uint32_t total_count, uint32_t total_count_change) override;

/// Add a GUID to the internal set of unique subscriptions matched to this publisher.
Expand All @@ -121,7 +121,7 @@ class RMWPublisherEvent final : public EventListenerInterface
*
* \param[in] guid The GUID of the newly-matched subscription to track.
*/
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void track_unique_subscription(eprosima::fastdds::rtps::GUID_t guid);

/// Remove a GUID from the internal set of unique subscriptions matched to this publisher.
Expand All @@ -131,28 +131,28 @@ class RMWPublisherEvent final : public EventListenerInterface
*
* \param[in] guid The GUID of the newly-unmatched subscription to track.
*/
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void untrack_unique_subscription(eprosima::fastdds::rtps::GUID_t guid);

/// Return the number of unique subscriptions matched to this publisher.
/**
* \return Number of unique subscriptions matched to this publisher.
*/
RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
size_t subscription_count() const;

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void update_deadline(uint32_t total_count, uint32_t total_count_change);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void update_liveliness_lost(uint32_t total_count, uint32_t total_count_change);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void update_offered_incompatible_qos(
eprosima::fastdds::dds::QosPolicyId_t last_policy_id,
uint32_t total_count, uint32_t total_count_change);

RMW_FASTDDS_SHARED_CPP_PUBLIC
RMW_FASTRTPS_SHARED_CPP_PUBLIC
void update_matched(
int32_t total_count,
int32_t total_count_change,
Expand Down
Loading

0 comments on commit 0d935da

Please sign in to comment.