diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-12 10:40:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-12 10:40:03 +0000 |
| commit | 816b7ad29e348973c3c1f59c5bf21dc8df417813 (patch) | |
| tree | 40333f841a918e034f4067f0f6eba94675f7d40c | |
| parent | 1c95403e1191b7809630f5d3d75a9d34350f952c (diff) | |
| download | ATCD-816b7ad29e348973c3c1f59c5bf21dc8df417813.tar.gz | |
Tue Apr 12 10:39:09 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/dds4ccm_base.mpb:
* MPC/config/dds4ccm_stub.mpb:
Attempt to fix windows link errors
| -rw-r--r-- | CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | CIAO/MPC/config/dds4ccm_base.mpb | 12 | ||||
| -rw-r--r-- | CIAO/MPC/config/dds4ccm_stub.mpb | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 1c2c2592675..a871952ce6b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 12 10:39:09 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/dds4ccm_base.mpb: + * MPC/config/dds4ccm_stub.mpb: + Attempt to fix windows link errors + Tue Apr 12 08:26:58 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany: @@ -31,8 +37,8 @@ Tue Apr 12 07:20:58 UTC 2011 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp: - Made some timing changes to make it more likely that DDS will call the on_requested_deadline_missed - callback of the PortStatusListener in the Receiver. + Made some timing changes to make it more likely that DDS will call the on_requested_deadline_missed + callback of the PortStatusListener in the Receiver. Also improved logging slightly. Mon Apr 11 15:36:46 UTC 2011 Marcel Smit <msmit@remedy.nl> diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb index d1f2686e135..62d30e5f9fc 100644 --- a/CIAO/MPC/config/dds4ccm_base.mpb +++ b/CIAO/MPC/config/dds4ccm_base.mpb @@ -1,17 +1,15 @@ // -*- MPC -*- // $Id$ -feature(dds4ccm_opendds) : dds4ccm, ciao_connector_base, dcps { - after += DDS4CCM_stub DDS4CCM_lem_gen - libs += DDS4CCM_stub +feature(dds4ccm_opendds) : dds4ccm_stub, ciao_connector_base, dcps { + after += DDS4CCM_lem_gen } -feature(dds4ccm_splice) : dds4ccm, ciao_connector_base { - after += DDS4CCM_stub DDS4CCM_lem_gen - libs += DDS4CCM_stub +feature(dds4ccm_splice) : dds4ccm_stub, ciao_connector_base { + after += DDS4CCM_lem_gen } -feature(dds4ccm_ndds) : ndds_idltocpp_lem_stub, ndds_idltocpp_impl, ciao_connector_base { +feature(dds4ccm_ndds) : dds4ccm_stub, ndds_idltocpp_lem_stub, ndds_idltocpp_impl, ciao_connector_base { after += DDS4CCM_lem_gen } diff --git a/CIAO/MPC/config/dds4ccm_stub.mpb b/CIAO/MPC/config/dds4ccm_stub.mpb index d124d3a7759..5396f833ea7 100644 --- a/CIAO/MPC/config/dds4ccm_stub.mpb +++ b/CIAO/MPC/config/dds4ccm_stub.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : dds4ccm_base { +project : dds4ccm, ccm_stub { libs += DDS4CCM_stub after += DDS4CCM_stub }
\ No newline at end of file |