Skip to content

Commit 56dabca

Browse files
author
Antoine Hoarau
committed
fix disabling c++ mangling on clang (flags are in ServicePlugin.hpp)
1 parent 4ecc4e5 commit 56dabca

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

rtt_dynamic_reconfigure/include/orocos/rtt_dynamic_reconfigure/server.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define RTT_DYNAMIC_RECONFIGURE_SERVER_H
3838

3939
#include <rtt/Service.hpp>
40+
#include <rtt/plugin/ServicePlugin.hpp>
4041
#include <rtt/TaskContext.hpp>
4142
#include <rtt/os/Mutex.hpp>
4243
#include <rtt/Logger.hpp>

rtt_rosclock/src/rtt_rosclock_service.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <rtt/RTT.hpp>
2+
#include <rtt/plugin/ServicePlugin.hpp>
23
#include <rtt/internal/GlobalService.hpp>
34

45
#include <rtt_rosclock/rtt_rosclock.h>
@@ -56,15 +57,15 @@ void loadROSClockService(){
5657

5758
using namespace RTT;
5859
extern "C" {
59-
bool loadRTTPlugin(RTT::TaskContext* c){
60+
RTT_EXPORT bool loadRTTPlugin(RTT::TaskContext* c){
6061
if (c != 0) return false;
6162
loadROSClockService();
6263
return true;
6364
}
64-
std::string getRTTPluginName (){
65+
RTT_EXPORT std::string getRTTPluginName (){
6566
return "rosclock";
6667
}
67-
std::string getRTTTargetName (){
68+
RTT_EXPORT std::string getRTTTargetName (){
6869
return OROCOS_TARGET_NAME;
6970
}
7071
}

rtt_roscomm/src/rtt_rosservice_registry_service.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ static void loadROSServiceRegistryService()
108108
using namespace RTT;
109109
using namespace rtt_roscomm;
110110
extern "C" {
111-
bool loadRTTPlugin(RTT::TaskContext* c){
111+
RTT_EXPORT bool loadRTTPlugin(RTT::TaskContext* c){
112112
if (c != 0) return false;
113113
loadROSServiceRegistryService();
114114
return true;
115115
}
116-
std::string getRTTPluginName (){
116+
RTT_EXPORT std::string getRTTPluginName (){
117117
return "rosservice_registry";
118118
}
119-
std::string getRTTTargetName (){
119+
RTT_EXPORT std::string getRTTTargetName (){
120120
return OROCOS_TARGET_NAME;
121121
}
122122
}

rtt_roscomm/src/rtt_rostopic_service.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <rtt/RTT.hpp>
2+
#include <rtt/plugin/ServicePlugin.hpp>
23
#include <rtt/internal/GlobalService.hpp>
34
#include <rtt_roscomm/rostopic.h>
45

@@ -49,15 +50,15 @@ void loadROSTopicService(){
4950

5051
using namespace RTT;
5152
extern "C" {
52-
bool loadRTTPlugin(RTT::TaskContext* c){
53+
RTT_EXPORT bool loadRTTPlugin(RTT::TaskContext* c){
5354
if (c != 0) return false;
5455
loadROSTopicService();
5556
return true;
5657
}
57-
std::string getRTTPluginName (){
58+
RTT_EXPORT std::string getRTTPluginName (){
5859
return "rostopic";
5960
}
60-
std::string getRTTTargetName (){
61+
RTT_EXPORT std::string getRTTTargetName (){
6162
return OROCOS_TARGET_NAME;
6263
}
6364
}

0 commit comments

Comments
 (0)