diff options
| author | msmit <msmit@remedy.nl> | 2010-05-26 14:46:04 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-05-26 14:46:04 +0000 |
| commit | dc180758ea8a567f37f8ff845ea9b3028582f596 (patch) | |
| tree | c9eaa2f7899310e80ebfe91880cb2ab3c79bdde7 | |
| parent | 962bb253046976afca0a0e37b20fbd791587335c (diff) | |
| download | ATCD-dc180758ea8a567f37f8ff845ea9b3028582f596.tar.gz | |
Wed May 26 14:43:24 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc:
* connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc:
* connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc:
* connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc:
Resolved static compile errors.
5 files changed, 14 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 05500501f80..3ba1eb53cde 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Wed May 26 14:43:24 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc: + Resolved static compile errors. + Wed May 26 14:38:58 UTC 2010 Adam Mitz <mitza@ociweb.com> * ciao/ComponentServer/CIAO_ComponentServer.mpc: @@ -8,7 +16,7 @@ Wed May 26 14:34:58 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * ciao/Servants/Connector_Servant_Impl_Base.cpp: * ciao/Servants/Connector_Servant_Impl_Base.h: - + Added no-ops for get_all_publishers() and get_all_emitters() if CCM_LW is not defined, so for generated connector servants, we can skip generation of these methods. diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc index 1d04d9740df..e430b524732 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/DDS_Receiver.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*latency_receiver_plain) : nddslib, acelib, taolib { +project(*latency_receiver_plain) : nddslib, acelib, taolib, anytypecode { after += DDS_Latency_Base_plain_stub exename = DDS_receiver libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc index f6ddfaee639..a82b1b51ef3 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/DDS_Sender.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*latency_sender_plain) : nddslib, acelib, taolib { +project(*latency_sender_plain) : nddslib, acelib, taolib, anytypecode { after += DDS_Latency_Base_plain_stub exename = DDS_Sender avoids += ace_for_tao @@ -14,7 +14,7 @@ project(*latency_sender_plain) : nddslib, acelib, taolib { } } -project(*ndds_latency_sender_plain) : nddslib, acelib, taolib { +project(*ndds_latency_sender_plain) : nddslib, acelib, taolib, anytypecode { after += DDS_Latency_Base_plain_stub exename = DDS_NDDS_Sender avoids += ace_for_tao diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc index d86cd380033..b0805a06208 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/DDS_Receiver.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*receiver_plain) : nddslib, acelib, taolib { +project(*receiver_plain) : nddslib, acelib, taolib, anytypecode { after += DDS_Throughput_Base_stub_plain exename = DDS_receiver libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc index ddca0efee62..8ef25a6d75a 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/DDS_Sender.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*sender_plain) : nddslib, acelib, taolib { +project(*sender_plain) : nddslib, acelib, taolib, anytypecode { after += DDS_Throughput_Base_stub_plain exename = DDS_Sender avoids += ace_for_tao |