diff options
| author | msmit <msmit@remedy.nl> | 2010-12-06 10:16:59 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-12-06 10:16:59 +0000 |
| commit | c45be30b60dfa802efe95cb37115ca0d2fc4290c (patch) | |
| tree | 7784f6feb38ab98c59ffd2144a148106495c857c | |
| parent | 67162685a55d4343199cd724d318b60243bf5a4c (diff) | |
| download | ATCD-c45be30b60dfa802efe95cb37115ca0d2fc4290c.tar.gz | |
Mon Dec 6 10:17:50 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc:
* connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp:
Resolved linker errors on windows.
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc | 8 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 67572a6f8f6..7c17de8a527 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 6 10:17:50 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc: + * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp: + Resolved linker errors on windows. + Mon Dec 6 00:27:20 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * MPC/config/dds4ccm_ts_default.mpb: diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc index 7ab294b3825..b53c899b32a 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc @@ -33,7 +33,7 @@ project(DDS_MultiTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm { project(DDS_MultiTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base { after += DDS_MultiTopic_Sender_lem_gen DDS_MultiTopic_Sender_stub DDS_MultiTopic_Base_stub - libs += DDS_MultiTopic_Base_stub Sender_stub + libs += Sender_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -83,12 +83,12 @@ project(DDS_MultiTopic_Sender_stub) : ccm_stub, dds4ccm_base { } } -project(DDS_MultiTopic_Sender_exec) : ciao_executor, dds4ccm_base { +project(DDS_MultiTopic_Sender_exec) : ciao_executor, dds4ccm_lem_stub { after += DDS_MultiTopic_Sender_lem_stub DDS_MultiTopic_Sender_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub + libs += Sender_stub Sender_lem_stub DDS_MultiTopic_Base_stub DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub libpaths += ../lib - includes += .. + includes += .. ../Connector libout = ../lib dynamicflags += SENDER_EXEC_BUILD_DLL diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp index 5e1e9121935..ee6c95b61fb 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp @@ -29,8 +29,6 @@ #include "tao/ORB_Core.h" #include "ace/Reactor.h" -#include "Connector/MultiTopic_Connector_T.h" - namespace CIAO_Shapes_Sender_Impl { //============================================================ |