diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-23 08:50:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-02-23 08:50:20 +0000 |
| commit | 38e4598679c338e47eb2d018db110d350265756d (patch) | |
| tree | 332950015d7c9fe902f3b8a95e934c3d1c6008bb /CIAO | |
| parent | 94c8b945f8d1480729f3f9abe931676d22076ac7 (diff) | |
| download | ATCD-38e4598679c338e47eb2d018db110d350265756d.tar.gz | |
Tue Feb 23 08:50:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
Added missing pragma
* connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc:
Disabled this project for the moment, rtiddsgen can't handle this
Diffstat (limited to 'CIAO')
4 files changed, 16 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 32ed880fc25..960cb4d02ee 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 23 08:50:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl: + Added missing pragma + + * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc: + Disabled this project for the moment, rtiddsgen can't handle this + Tue Feb 23 07:47:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl index 52e7455c2a9..bf36400955d 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl @@ -19,6 +19,8 @@ struct GetterTest { }; typedef sequence<GetterTest> GetterTest_Seq; +#pragma DCPS_DATA_TYPE "GetterFixed" + struct GetterFixed { long key; long iteration; diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc index 0a2bd52b3ab..adca4b6f90f 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc @@ -2,7 +2,6 @@ project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults, dds4ccm { custom_only = 1 - after += idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \ -Wb,stub_export_include=QueryFilter_Starter_stub_export.h \ -Wb,skel_export_macro=READER_STARTER_SVNT_Export \ diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc index e670667cddb..3764b7ee0ef 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc @@ -1,6 +1,7 @@ // $Id$ project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm { + requires += dummy_label after += DDS4CCM_idl_gen custom_only = 1 idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \ @@ -19,6 +20,7 @@ project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm { } project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + requires += dummy_label custom_only = 1 after += DDS_TTDN_Connector_idl_gen idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \ @@ -32,6 +34,7 @@ project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_base { + requires += dummy_label after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ DDS4CCM_lem_stub @@ -61,6 +64,7 @@ project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_base { } project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base { + requires += dummy_label after += DDS_TTDN_Connector_idl_gen \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub libs += DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub @@ -88,6 +92,7 @@ project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl { + requires += dummy_label after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub DDS4CCM_lem_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub @@ -118,6 +123,7 @@ project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl { + requires += dummy_label after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \ DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \ DDS_TTDN_Connector_stub DDS4CCM_lem_stub |