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

[20569] Migrate DLL API exporter to fastdds #104

Merged
merged 2 commits into from
Mar 12, 2024
Merged

[20569] Migrate DLL API exporter to fastdds #104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e11a867
Refs #20569: Rename RTPS_DllAPI to FASTDDS_EXPORTED_API
EduPonz Mar 5, 2024
04421df
Refs #20569: Fix compilation due to movement of LibrarySettings in Fa…
EduPonz Mar 12, 2024
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
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/fastdds.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ bool has_statistics();

// Macro delcarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTDDS_EXPORTED_API
#define FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
#define FASTDDS_TODO_BEFORE(major, minor, msg)

Expand Down
6 changes: 3 additions & 3 deletions fastdds_python/src/swig/fastdds/dds/domain/DomainParticipant.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
if (nullptr != listener)
{
Swig::Director* director = SWIG_DIRECTOR_CAST(listener);

if (nullptr != director)
{
Py_INCREF(director->swig_get_self());
Expand All @@ -93,7 +93,7 @@
if (nullptr != old_listener)
{
Swig::Director* director = SWIG_DIRECTOR_CAST(old_listener);

if (nullptr != director)
{
Py_DECREF(director->swig_get_self());
Expand Down Expand Up @@ -227,7 +227,7 @@
* @param mask StatusMask that holds statuses the listener responds to (default: all)
* @return Pointer to the created Subscriber.
*/
RTPS_DllAPI Subscriber* create_subscriber_with_profile(
FASTDDS_EXPORTED_API Subscriber* create_subscriber_with_profile(
const std::string& profile_name,
SubscriberListener* listener = nullptr,
const StatusMask& mask = eprosima::fastdds::dds::StatusMask::all())
Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/fastdds/dds/subscriber/Subscriber.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
* @param mask StatusMask that holds statuses the listener responds to (default: all).
* @return Pointer to the created DataReader. nullptr if failed.
*/
RTPS_DllAPI DataReader* create_datareader_with_profile(
FASTDDS_EXPORTED_API DataReader* create_datareader_with_profile(
TopicDescription* topic,
const std::string& profile_name,
DataReaderListener* listener = nullptr,
Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_complete.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

// Macro declarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTDDS_EXPORTED_API
#define eProsima_user_DllExport

%include "test_included_modules.i"
Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_included_modules.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

// Macro declarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTDDS_EXPORTED_API
#define eProsima_user_DllExport


Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/test/types/test_modules.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

// Macro declarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTDDS_EXPORTED_API
#define eProsima_user_DllExport


Expand Down
2 changes: 1 addition & 1 deletion fastdds_python_examples/HelloWorldExample/HelloWorld.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

// Macro declarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTDDS_EXPORTED_API
#define eProsima_user_DllExport


Expand Down
Loading