diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/CSLUnexpStat')
3 files changed, 14 insertions, 8 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl index 8bc2f1bb8ad..c628b16045b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl @@ -18,6 +18,8 @@ struct TestTopic { string key; //@key long x; }; +#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED typedef sequence<TestTopic> TestTopicSeq; - #endif + +#endif /* CSL_USTEST_BASE_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl index dc50dd006eb..3f3d1c4d29a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl @@ -15,6 +15,10 @@ #pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl" +#if (CIAO_DDS4CCM_OPENDDS==1) +# include "Base/CSL_USTest_BaseTypeSupport.idl" +#endif + module ::CCM_DDS::Typed < ::TestTopic, ::TestTopicSeq> CSL_US_Connector; #endif /* CSL_USTest_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc index 0681b875095..da92a6b340c 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc @@ -2,7 +2,7 @@ // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector" project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen + after += DDS4CCM_idl_gen DDS_CSL_USTest_Base_stub custom_only = 1 idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \ -Wb,stub_export_include=CSL_USTest_Connector_stub_export.h \ @@ -33,8 +33,8 @@ project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } project(DDS_CSL_USTest_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub - libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub + after += DDS_CSL_USTest_Connector_lem_gen DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Base_stub + libs += DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub libpaths += ../lib libout = ../lib includes += .. @@ -85,9 +85,9 @@ project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub + after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub sharedname = DDS_CSL_USTest_Connector_exec - libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub + libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -111,12 +111,12 @@ project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub + after += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_exec DDS_CSL_USTest_Connector_stub sharedname = DDS_CSL_USTest_Connector_svnt libs += DDS_CSL_USTest_Connector_stub \ DDS_CSL_USTest_Connector_lem_stub \ DDS_CSL_USTest_Base_stub \ - DDS_CSL_USTest_Connector_exec + DDS_CSL_USTest_Connector_exec libpaths += ../lib libout = ../lib includes += .. |