diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-20 08:46:28 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-04-20 08:46:28 +0000 |
commit | 8ef7fc96d4ba8e8cea8efda0c2c71ace630abf5d (patch) | |
tree | c452168e69534d5cfb898ee1c740ad8dee438c75 /CIAO/connectors | |
parent | e3dd2b8a28283abb64b6e73bbdc2c09991211d45 (diff) | |
download | ATCD-8ef7fc96d4ba8e8cea8efda0c2c71ace630abf5d.tar.gz |
Wed Apr 20 08:11:49 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* CIAO_TAO_DAnCE.mwc:
* MPC/config/dds4ccm_ts_default.mpb:
* MPC/config/ndds_idltocpp.mpb:
* MPC/config/ndds_idltocpp_stub.mpb:
* MPC/config/ndds_idltocpp_ts_defaults.mpb:
* connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
* connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl:
* connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc:
* connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl:
* connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
* connectors/dds4ccm/idl/dds4ccm_Base.idl:
* connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl:
* connectors/dds4ccm/idl/dds4ccm_skel.mpc:
* connectors/dds4ccm/idl/dds4ccm_stub.mpc:
* connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
* connectors/dds4ccm/impl/CCM_DataReader.h:
* connectors/dds4ccm/impl/CCM_DataReader.cpp:
* connectors/dds4ccm/impl/CCM_DataWriter.h:
* connectors/dds4ccm/impl/CCM_DataWriter.cpp:
* connectors/dds4ccm/impl/ConditionManager.h:
* connectors/dds4ccm/impl/ConditionManager.cpp:
* connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
* connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
* connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
* connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
* connectors/dds4ccm/impl/DDS_Update_T.cpp:
* connectors/dds4ccm/impl/DDS_Write_T.cpp:
* connectors/dds4ccm/impl/InstanceHandleManager_T.h:
* connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
* connectors/dds4ccm/impl/PortStatusListener.cpp:
* connectors/dds4ccm/impl/PublisherListener.cpp:
* connectors/dds4ccm/impl/Reader_T.h:
* connectors/dds4ccm/impl/Reader_T.cpp:
* connectors/dds4ccm/impl/SubscriberListener.cpp:
* connectors/dds4ccm/impl/Updater_T.h:
* connectors/dds4ccm/impl/Updater_T.cpp:
* connectors/dds4ccm/impl/Writer_T.h:
* connectors/dds4ccm/impl/Writer_T.cpp:
* connectors/dds4ccm/impl/dds4ccm_conf.h:
* connectors/dds4ccm/impl/dds4ccm_impl.mpc:
* connectors/dds4ccm/impl/ndds/WaitSet.h:
* connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
* connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
* connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl:
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc:
* connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
* connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
* connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
* connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl:
* connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl:
* connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
* connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp:
* connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
* connectors/dds4ccm/tests/Derived/Derived.idl:
* connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
* connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
* connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
* connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
* connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl:
* connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl:
* connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
* connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
* connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl:
* connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl:
* connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl:
* connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl:
* connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl:
* connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl:
* connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
* connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
* connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl:
* connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl:
* connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl:
* connectors/dds4ccm/tests/NoModule/NoModule.idl:
* connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
* connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
* connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
* connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
* connectors/dds4ccm/tests/PSAT/psat_type.idl:
* connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
* connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
* connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
* connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
* connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
* connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
* connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
* connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
* connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
* connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
* connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
* connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
* connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
* connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
* connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
* connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
* connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
* connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl:
* connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl:
* connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl:
* connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl:
* connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
* connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
Extended portability for dds4ccm
Diffstat (limited to 'CIAO/connectors')
109 files changed, 257 insertions, 101 deletions
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl index b888931845c..a007b78098e 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl +++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl @@ -9,7 +9,7 @@ #define HELLO_BASE_IDL #pragma ndds typesupport "Base/Hello_BaseSupport.h" -#pragma opendds typesupport "Base/Hello_BaseTypeSupportC.h" +#pragma opendds typesupport "Base/Hello_BaseTypeSupportImpl.h" #pragma splice typesupport "Base/Hello_BaseDcpsC.h" #pragma DCPS_DATA_TYPE "DDSHello" diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl index c0d19a6e3a4..3551ecf5326 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl @@ -4,6 +4,10 @@ #define LARGE_COMMON_IDL #pragma ndds typesupport "Common/CommonSupport.h" +#pragma opendds typesupport "Common/CommonTypeSupportImpl.h" + +#pragma DCPS_DATA_TYPE "LargeType" +#pragma DCPS_DATA_KEY "LargeType value" struct LargeType { string value; //@key diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc index 9f7b289b0d9..e32291b6512 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc @@ -1,7 +1,6 @@ // $Id$ -project (Large_Deployment_stub) : ciaoidldefaults, \ - portableserver, dds4ccm_ts_default { +project (Large_Deployment_stub) : taoidldefaults, dds4ccm_ts_default { sharedname = Large_Deployment_stub dynamicflags += LARGE_DEPLOYMENT_COMMON_STUB_BUILD_DLL libout = ../lib @@ -10,7 +9,6 @@ project (Large_Deployment_stub) : ciaoidldefaults, \ -Wb,export_macro=LARGE_DEPLOYMENT_COMMON_STUB_Export \ -Wb,export_include=Large_Deployment_Common_stub_export.h - IDL_Files { Common.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl index 309020ded93..f10374c18f6 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl @@ -9,7 +9,7 @@ #define QUOTER_BASE_IDL #pragma ndds typesupport "Base/Quoter_BaseSupport.h" -#pragma opendds typesupport "Base/Quoter_BaseTypeSupportC.h" +#pragma opendds typesupport "Base/Quoter_BaseTypeSupportImpl.h" #pragma coredx typesupport "Base/Quoter_BaseTypeSupport.hh" #pragma DCPS_DATA_TYPE "Quoter::Stock_Info" diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl index 459384fc6e9..89c617969bf 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl @@ -9,7 +9,7 @@ #define SHAPES_BASE_IDL #pragma ndds typesupport "Base/Shapes_BaseSupport.h" -#pragma opendds typesupport "Base/Shapes_BaseTypeSupportC.h" +#pragma opendds typesupport "Base/Shapes_BaseTypeSupportImpl.h" #pragma splice typesupport "Base/Shapes_BaseDscpC.h" #pragma DCPS_DATA_TYPE "ShapeType" diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl index 1136ceaf27f..a246c468b80 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl @@ -8,6 +8,7 @@ #define DDS4CCM_BASE_IDL3 #include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl" +#include "connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl" #pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_BaseE.idl" @@ -38,11 +39,6 @@ module CCM_DDS }; typedef sequence<ReadInfo> ReadInfoSeq; - struct QueryFilter { - string expression; - ::DDS::StringSeq parameters; - }; - enum ListenerMode { NOT_ENABLED, ONE_BY_ONE, diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl new file mode 100644 index 00000000000..52b70b94653 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl @@ -0,0 +1,19 @@ +// $Id$ +/** + * @file dds4ccm_QueryFilter.idl + */ + +#ifndef DDS4CCM_QUERYFILTER_IDL3 +#define DDS4CCM_QUERYFILTER_IDL3 + +#include "connectors/dds4ccm/idl/dds_rtf2_dcps.idl" + +module CCM_DDS +{ + struct QueryFilter { + string expression; + ::DDS::StringSeq parameters; + }; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 113d1b6ddbf..5ce6f26cf24 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -9,6 +9,7 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_outpu Header_Files { dds4ccm_BaseS.h + dds4ccm_QueryFilterS.h dds4ccm_PortStatusListenerS.h dds4ccm_DataListenerControlS.h dds4ccm_StateListenerControlS.h diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index 6c168432efd..fe189aa6d4e 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -15,6 +15,13 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { IDL_Files { idlflags -= -Gxhst -Gxhsk + idlflags -= -St -Sa + idlflags += -SS + dds4ccm_QueryFilter.idl + } + + IDL_Files { + idlflags -= -Gxhst -Gxhsk idlflags += -Sci -SS -Scc dds4ccm_Entity.idl ccm_dds.idl @@ -32,7 +39,6 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { } project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib { - after += DDS4CCM_idl_gen includes += $(CIAO_ROOT)/connectors @@ -42,6 +48,7 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp Header_Files { dds4ccm_BaseC.h + dds4ccm_QueryFilterC.h dds4ccm_PortStatusListenerC.h dds4ccm_DataListenerControlC.h dds4ccm_ConnectorStatusListenerC.h @@ -51,6 +58,7 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp Source_Files { dds4ccm_BaseC.cpp + dds4ccm_QueryFilterC.cpp dds4ccm_PortStatusListenerC.cpp dds4ccm_DataListenerControlC.cpp dds4ccm_ConnectorStatusListenerC.cpp diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl index cdc361cbe1f..bfedc740075 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl @@ -5,7 +5,6 @@ #pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcpsE.idl" - # define DOMAINID_TYPE_NATIVE long # define HANDLE_TYPE_NATIVE long # define HANDLE_NIL_NATIVE 0 diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp index e9686fa922f..ea7741dcc66 100644 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.cpp @@ -169,7 +169,7 @@ CIAO::DDS4CCM::CCM_DataReader::get_matched_publications ( ::DDS::ReturnCode_t CIAO::DDS4CCM::CCM_DataReader::get_matched_publication_data ( ::DDS::PublicationBuiltinTopicData & publication_data, - const ::DDS::InstanceHandle_t & publication_handle) + DDS_INSTANCE_HANDLE_T_IN publication_handle) { return this->dds_entity ()->get_matched_publication_data (publication_data, publication_handle); } diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h index 67e95d2cd1a..41b5fa0b6ed 100644 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/CCM_DataReader.h @@ -11,6 +11,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/impl/dds4ccm_dds_impl_export.h" +#include "dds4ccm/impl/dds4ccm_conf.h" namespace CIAO { @@ -97,7 +98,7 @@ namespace CIAO virtual ::DDS::ReturnCode_t get_matched_publication_data (::DDS::PublicationBuiltinTopicData & , - const ::DDS::InstanceHandle_t & ); + DDS_INSTANCE_HANDLE_T_IN ); void set_dds_entity (::DDS::DataReader_ptr dr); diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp index e058eac40d8..57efbea4f33 100644 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp +++ b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.cpp @@ -120,7 +120,7 @@ CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscriptions (::DDS::InstanceHandleS ::DDS::ReturnCode_t CIAO::DDS4CCM::CCM_DataWriter::get_matched_subscription_data ( ::DDS::SubscriptionBuiltinTopicData & data, - const ::DDS::InstanceHandle_t &handle) + DDS_INSTANCE_HANDLE_T_IN handle) { return this->impl ()->get_matched_subscription_data (data, handle); } diff --git a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h index 118c98b58cb..91e719f2681 100644 --- a/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/CCM_DataWriter.h @@ -11,6 +11,7 @@ #include "dds4ccm/idl/dds_rtf2_dcpsEC.h" #include "dds4ccm/impl/dds4ccm_dds_impl_export.h" +#include "dds4ccm/impl/dds4ccm_conf.h" namespace CIAO { @@ -80,7 +81,7 @@ namespace CIAO virtual ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & , - const ::DDS::InstanceHandle_t & ); + DDS_INSTANCE_HANDLE_T_IN); void set_dds_entity (::DDS::DataWriter_ptr dw); diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp index 276f0e2d19c..acdaf317738 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp @@ -1,22 +1,20 @@ // $Id$ +#include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/ConditionManager.h" - #include "dds4ccm/impl/Utils.h" - #include "ace/OS_NS_sys_time.h" -#include "dds4ccm/impl/logger/Log_Macros.h" namespace CIAO { namespace DDS4CCM { - ConditionManager::ConditionManager () + ConditionManager::ConditionManager (void) { DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::ConditionManager"); } - ConditionManager::~ConditionManager () + ConditionManager::~ConditionManager (void) { DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::~ConditionManager"); } @@ -54,15 +52,19 @@ namespace CIAO } ::DDS::InstanceHandle_t - ConditionManager::check_handle (const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle) + ConditionManager::check_handle (DDS_INSTANCE_HANDLE_T_IN instance_handle, + DDS_INSTANCE_HANDLE_T_IN lookup_handle) { bool error = false; bool non_existent = false; +#if (CIAO_DDS4CCM_NDDS==1) ::DDS::InstanceHandle_t ret = this->ws_.check_handle (instance_handle, lookup_handle, error, non_existent); +#else + ::DDS::InstanceHandle_t ret; +#endif if (error) throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); if (non_existent) @@ -79,7 +81,11 @@ namespace CIAO ::DDS::ReadCondition_var rc = this->get_readcondition (); ::DDS::QueryCondition_var qc = this->get_querycondition_getter (); +#if (CIAO_DDS4CCM_NDDS==1) return this->ws_.check_condition (rc.in (), qc.in (), condition); +#else + return false; +#endif } void @@ -87,6 +93,7 @@ namespace CIAO { DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::init_readcondition"); +#if (CIAO_DDS4CCM_NDDS==1) if (!this->ws_.get_rti_entity ()) { // Waitset is created when a query condition is attached. @@ -94,6 +101,7 @@ namespace CIAO // (including its proxy). this->ws_.init (); } +#endif if ( ::CORBA::is_nil (this->rd_condition_.in ())) { this->rd_condition_ = this->dds_entity ()->create_readcondition ( @@ -272,10 +280,12 @@ namespace CIAO { DDS4CCM_TRACE ("CIAO::DDS4CCM::ConditionManager::attach_querycondition"); +#if (CIAO_DDS4CCM_NDDS==1) if (!this->ws_.get_rti_entity ()) { this->ws_.init (); } +#endif ::DDS::ReturnCode_t retcode = this->ws_.attach_condition (this->qc_getter_.in ()); @@ -374,7 +384,9 @@ namespace CIAO this->remove_condition (qc.in (), "listener"); } +#if (CIAO_DDS4CCM_NDDS==1) if (this->ws_.get_rti_entity ()) +#endif { // Waitset is created. Therefor detach any condition // from the waitset first (in this case, the query condition). diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h index c8451b6f579..42e7ac0083f 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.h @@ -3,12 +3,15 @@ #ifndef CONDITIONMANAGER_H_ #define CONDITIONMANAGER_H_ +#include "dds4ccm/idl/dds4ccm_BaseC.h" +#include "dds4ccm/impl/dds4ccm_conf.h" + #if (CIAO_DDS4CCM_NDDS==1) #include "dds4ccm/impl/ndds/WaitSet.h" +#elif (CIAO_DDS4CCM_OPENDDS==1) +#include "dds/DCPS/WaitSet.h" #endif -#include <dds4ccm/idl/dds4ccm_BaseC.h> - #include "dds4ccm/impl/dds4ccm_dds_impl_export.h" namespace CCM_DDS @@ -27,7 +30,6 @@ namespace CIAO * * Manages the read and query conditions for the Getter, * Reader and listeners. - * */ class DDS4CCM_DDS_IMPL_Export ConditionManager { @@ -63,8 +65,8 @@ namespace CIAO * */ ::DDS::InstanceHandle_t check_handle ( - const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle, + DDS_INSTANCE_HANDLE_T_IN lookup_handle); /** * @@ -170,7 +172,11 @@ namespace CIAO ::DDS::DataReader_var dr_; //TODO: Not allowed +#if (CIAO_DDS4CCM_NDDS==1) ::CIAO::NDDS::DDS_WaitSet_i ws_; +#elif (CIAO_DDS4CCM_OPENDDS==1) + ::DDS::WaitSet ws_; +#endif /** * Different QueryConditions since the sample mask diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp index 453bdba18a2..5bce7b0c258 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp @@ -108,6 +108,7 @@ DDS_Base_Connector_T<CCM_TYPE>::init_domain ( if (!::CORBA::is_nil (this->qos_profile_.in ())) { +#if (CIAO_DDS4CCM_NDDS==1) this->participant_factory_.set_default_participant_qos_with_profile ( this->qos_profile_.in ()); @@ -116,6 +117,7 @@ DDS_Base_Connector_T<CCM_TYPE>::init_domain ( this->qos_profile_.in (), ::DDS::DomainParticipantListener::_nil (), 0); +#endif } else { @@ -236,11 +238,13 @@ DDS_Base_Connector_T<CCM_TYPE>::init_topic ( ::DDS::Topic_var tp; if (!::CORBA::is_nil (this->qos_profile_.in ())) { +#if (CIAO_DDS4CCM_NDDS==1) tp = participant->create_topic_with_profile (topic_name, typesupport_name, this->qos_profile_.in (), ::DDS::TopicListener::_nil (), 0); +#endif } else { @@ -273,10 +277,12 @@ DDS_Base_Connector_T<CCM_TYPE>::init_publisher ( { if (!::CORBA::is_nil (this->qos_profile_.in ())) { +#if (CIAO_DDS4CCM_NDDS==1) publisher = participant->create_publisher_with_profile ( this->qos_profile_.in (), ::DDS::PublisherListener::_nil (), 0); +#endif } else { @@ -307,10 +313,12 @@ DDS_Base_Connector_T<CCM_TYPE>::init_subscriber ( { if (!::CORBA::is_nil (this->qos_profile_.in ())) { +#if (CIAO_DDS4CCM_NDDS==1) subscriber = participant->create_subscriber_with_profile ( this->qos_profile_.in (), ::DDS::SubscriberListener::_nil (), 0); +#endif } else { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h index 087a32b2e19..307ce1d5b0c 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h @@ -7,9 +7,13 @@ #define DDS_BASE_CONNECTOR_T_H_ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" -#include "ace/Copy_Disabled.h" +#if (CIAO_DDS4CCM_NDDS==1) #include "dds4ccm/impl/ndds/DomainParticipantFactory.h" +#elif (CIAO_DDS4CCM_OPENDDS==1) +#include "dds/DCPS/DomainParticipantFactoryImpl.h" +#endif #include "dds4ccm/impl/logger/Logger_Service.h" +#include "ace/Copy_Disabled.h" template <typename CCM_TYPE> class DDS_Base_Connector_T @@ -17,9 +21,12 @@ class DDS_Base_Connector_T public virtual ::CORBA::LocalObject, private virtual ACE_Copy_Disabled { -typedef ::CIAO::NDDS::DDS_DomainParticipantFactory_i - DomainParticipantFactory; - +#if (CIAO_DDS4CCM_NDDS==1) + typedef ::CIAO::NDDS::DDS_DomainParticipantFactory_i + DomainParticipantFactory; +#elif (CIAO_DDS4CCM_OPENDDS==1) + typedef ::OpenDDS::DCPS::DomainParticipantFactoryImpl DomainParticipantFactory; +#endif public: DDS_Base_Connector_T (void); virtual ~DDS_Base_Connector_T (void); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index ada89637629..e7a8655497a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -58,11 +58,13 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::c } if (qos_profile) { +#if (CIAO_DDS4CCM_NDDS==1) dr = subscriber->create_datareader_with_profile ( td.in (), qos_profile, ::DDS::DataReaderListener::_nil (), 0); +#endif } else { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp index adb28831efb..56818ca9d8e 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp @@ -72,7 +72,13 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete"); BaseConnector::configuration_complete (); - const char* typesupport_name = DDS_TYPE::type_support::get_type_name (); + ::CORBA::String_var typesupport_name; +#if (CIAO_DDS4CCM_NDDS==1) + typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ()); +#elif (CIAO_DDS4CCM_OPENDDS==1) + typename DDS_TYPE::type_support type; + typesupport_name = type.get_type_name (); +#endif if (::CORBA::is_nil (this->topic_.in ())) { @@ -81,7 +87,7 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::configuration_complete this->init_topic (this->domain_participant_.in (), this->topic_.inout () , this->topic_name_.in (), - typesupport_name); + typesupport_name.in ()); } this->init_subscriber (this->domain_participant_.in (), this->subscriber_.inout ()); @@ -151,9 +157,16 @@ DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE>::ccm_remove (void) topic.in ()); } - const char* typesupport_name = DDS_TYPE::type_support::get_type_name (); + ::CORBA::String_var typesupport_name; +#if (CIAO_DDS4CCM_NDDS==1) + typesupport_name = ::CORBA::string_dup (DDS_TYPE::type_support::get_type_name ()); +#elif (CIAO_DDS4CCM_OPENDDS==1) + typename DDS_TYPE::type_support type; + typesupport_name = type.get_type_name (); +#endif + this->unregister_type (this->domain_participant_.in (), - typesupport_name); + typesupport_name.in ()); ::DDS::Subscriber_var subscriber = this->subscriber_._retn (); if (! CORBA::is_nil (subscriber.in ())) diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index cafe06a9379..09e4a265862 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -36,11 +36,13 @@ DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_ ::DDS::DataWriter_var dwv_tmp; if (qos_profile) { +#if (CIAO_DDS4CCM_NDDS==1) dwv_tmp = publisher->create_datawriter_with_profile ( topic, qos_profile, ::DDS::DataWriterListener::_nil (), 0); +#endif } else { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index 7ddd7726471..6661330aa64 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -37,11 +37,13 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_c ::DDS::DataWriter_var dwv_tmp; if (qos_profile) { +#if (CIAO_DDS4CCM_NDDS==1) dwv_tmp = publisher->create_datawriter_with_profile ( topic, qos_profile, ::DDS::DataWriterListener::_nil (), 0); +#endif } else { diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp index 60063f6b878..f9bc060fa31 100644 --- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.cpp @@ -47,7 +47,7 @@ namespace CIAO void InstanceHandleManager_T<BASE_TYPE, WRITER_TYPE, VALUE_TYPE>::unregister_instance ( const VALUE_TYPE& datum, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { this->dds_writer ()->unregister_instance (datum, instance_handle); } diff --git a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h index c28fcb33961..1a4e3f50d6c 100644 --- a/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h +++ b/CIAO/connectors/dds4ccm/impl/InstanceHandleManager_T.h @@ -36,7 +36,7 @@ namespace CIAO virtual void unregister_instance ( const VALUE_TYPE& datum, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); void set_dds_writer (::DDS::DataWriter_ptr dds_writer); diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp index 17506b8c229..472adbc0e18 100644 --- a/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener.cpp @@ -34,10 +34,11 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("PortStatusListener::on_requested_deadline_missed: ") - ACE_TEXT ("total count <%d> - total change <%d> - ") - ACE_TEXT ("last instance handle <length <%d> - isValid <%d>\n"), - status.total_count, status.total_count_change, - status.last_instance_handle.length, status.last_instance_handle.isValid)); + ACE_TEXT ("total count <%d> - total change <%d> - ") + ACE_TEXT ("last instance") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER + ACE_TEXT ("\n"), + status.total_count, status.total_count_change, + DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); if (! ::CORBA::is_nil (this->port_status_listener_)) { diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp index 79818d7d721..785d5d4f039 100644 --- a/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/PublisherListener.cpp @@ -91,10 +91,10 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("PublisherListener::on_offered_deadline_missed: ") ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last instance handle length <%d> - isValid <%d>\n"), + ACE_TEXT ("last instance handle ") + DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), status.total_count, status.total_count_change, - status.last_instance_handle.length, - status.last_instance_handle.isValid)); + DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); if (! ::CORBA::is_nil (this->error_listener_)) { @@ -233,11 +233,11 @@ namespace CIAO ACE_TEXT ("PublisherListener::on_publication_matched: ") ACE_TEXT ("total count <%d> - count change <%d> - ") ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle length <%d> - isValid <%d>\n"), + ACE_TEXT ("last publication handle ") + DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), status.total_count, status.total_count_change, status.current_count, status.current_count_change, - status.last_subscription_handle.length, - status.last_subscription_handle.isValid)); + DDS_INSTANCE_HANDLE_LOG (status.last_subscription_handle))); this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS); } diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 69640c2eef9..98d7dc6515c 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -26,7 +26,7 @@ namespace CIAO ::DDS::InstanceHandle_t Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::check_handle ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { ::DDS::InstanceHandle_t const lookup_hnd = this->dds_reader ()->lookup_instance (an_instance); @@ -96,7 +96,7 @@ namespace CIAO Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_w_instance ( SEQ_VALUE_TYPE & data, ::DDS::SampleInfoSeq & sample_info, - const ::DDS::InstanceHandle_t & lookup_hnd) + DDS_INSTANCE_HANDLE_T_IN lookup_hnd) { DDS4CCM_TRACE ("Reader_T::read_w_instance"); @@ -247,7 +247,7 @@ namespace CIAO Reader_T<READER_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::read_one_last ( VALUE_TYPE& an_instance, ::CCM_DDS::ReadInfo_out info, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { ::DDS::InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); @@ -285,7 +285,7 @@ namespace CIAO const VALUE_TYPE& an_instance, SEQ_VALUE_TYPE& instances, ::CCM_DDS::ReadInfoSeq& infos, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { ::DDS::InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle); diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.h b/CIAO/connectors/dds4ccm/impl/Reader_T.h index 697704a5bf5..730844ba84b 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.h +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.h @@ -44,13 +44,13 @@ namespace CIAO virtual void read_one_last ( VALUE_TYPE& an_instance, ::CCM_DDS::ReadInfo_out info, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); virtual void read_one_all ( const VALUE_TYPE& an_instance, SEQ_VALUE_TYPE& instances, ::CCM_DDS::ReadInfoSeq& infos, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); virtual ::CCM_DDS::QueryFilter *query (void); @@ -74,7 +74,7 @@ namespace CIAO ::DDS::InstanceHandle_t check_handle ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); void convert_data ( const SEQ_VALUE_TYPE& all_data, @@ -90,7 +90,7 @@ namespace CIAO void read_w_instance ( SEQ_VALUE_TYPE& data, ::DDS::SampleInfoSeq & sample_info, - const ::DDS::InstanceHandle_t & lookup_hnd); + DDS_INSTANCE_HANDLE_T_IN lookup_hnd); void return_loan ( SEQ_VALUE_TYPE& data, diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp index bc273dfe649..3a9bc9e9554 100644 --- a/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener.cpp @@ -155,13 +155,13 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("SubscriberListener::on_liveliness_changed: ") - ACE_TEXT ("alive count <%d> - not alive count <%d> - ") - ACE_TEXT ("alive count change <%d> - not alive count change <%d> ") - ACE_TEXT ("last publication handle length <%d> - isValid <%d>\n"), - status.alive_count, status.not_alive_count, - status.alive_count_change, status.not_alive_count_change, - status.last_publication_handle.length, - status.last_publication_handle.isValid)); + ACE_TEXT ("alive count <%d> - not alive count <%d> - ") + ACE_TEXT ("alive count change <%d> - not alive count change <%d> ") + ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER + ACE_TEXT ("\n"), + status.alive_count, status.not_alive_count, + status.alive_count_change, status.not_alive_count_change, + DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle))); this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS); } @@ -175,13 +175,12 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("SubscriberListener::on_sample_rejected: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("last reason <%C> - last instance handle ") - ACE_TEXT ("<length <%d> - isValid <%d>\n"), - status.total_count, status.total_count_change, - translate_rejectedstatuskind (status.last_reason), - status.last_instance_handle.length, - status.last_instance_handle.isValid)); + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("last reason <%C> - last instance handle ") + DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("\n"), + status.total_count, status.total_count_change, + translate_rejectedstatuskind (status.last_reason), + DDS_INSTANCE_HANDLE_LOG (status.last_instance_handle))); if (! ::CORBA::is_nil (this->error_listener_)) { @@ -237,13 +236,13 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, DDS4CCM_INFO ACE_TEXT ("SubscriberListener::on_subscription_matched: ") - ACE_TEXT ("total count <%d> - count change <%d> - ") - ACE_TEXT ("current count <%d> - current count change <%d> ") - ACE_TEXT ("last publication handle length <%d> - isValid <%d>\n"), - status.total_count, status.total_count_change, - status.current_count, status.current_count_change, - status.last_publication_handle.length, - status.last_publication_handle.isValid)); + ACE_TEXT ("total count <%d> - count change <%d> - ") + ACE_TEXT ("current count <%d> - current count change <%d> ") + ACE_TEXT ("last publication handle ") DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER + ACE_TEXT ("\n"), + status.total_count, status.total_count_change, + status.current_count, status.current_count_change, + DDS_INSTANCE_HANDLE_LOG (status.last_publication_handle))); this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS); } diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp index 7f7013cd1c9..718837235f7 100644 --- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp @@ -93,7 +93,7 @@ namespace CIAO void Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::update_i ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, + DDS_INSTANCE_HANDLE_T_IN instance_handle, ::CCM_DDS::DataNumber_t index) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i"); @@ -113,7 +113,7 @@ namespace CIAO void Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::update_one ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one"); ::DDS::InstanceHandle_t hnd = instance_handle; @@ -144,7 +144,7 @@ namespace CIAO void Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::delete_i ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, + DDS_INSTANCE_HANDLE_T_IN instance_handle, ::CCM_DDS::DataNumber_t index) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i"); @@ -173,7 +173,7 @@ namespace CIAO void Updater_T<UPDATER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::delete_one ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one"); ::DDS::InstanceHandle_t hnd = instance_handle; diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.h b/CIAO/connectors/dds4ccm/impl/Updater_T.h index 6bdd1ccaf19..e14a488cb8e 100644 --- a/CIAO/connectors/dds4ccm/impl/Updater_T.h +++ b/CIAO/connectors/dds4ccm/impl/Updater_T.h @@ -33,11 +33,11 @@ namespace CIAO virtual void update_one ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); virtual void delete_one ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); virtual void create_many (const SEQ_VALUE_TYPE& data); @@ -64,12 +64,12 @@ namespace CIAO void update_i ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, + DDS_INSTANCE_HANDLE_T_IN instance_handle, ::CCM_DDS::DataNumber_t index); void delete_i ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle, + DDS_INSTANCE_HANDLE_T_IN instance_handle, ::CCM_DDS::DataNumber_t index); void check_existent (const SEQ_VALUE_TYPE& data); diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp index 67b294fd6ea..d6038e65964 100644 --- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp @@ -26,7 +26,7 @@ namespace CIAO void Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::write_i ( const VALUE_TYPE& datum, - const ::DDS::InstanceHandle_t& instance_handle, + DDS_INSTANCE_HANDLE_T_IN instance_handle, ::CCM_DDS::DataNumber_t index) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i"); @@ -47,7 +47,7 @@ namespace CIAO void Writer_T<WRITER_TYPE, TYPED_DDS_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::write_one ( const VALUE_TYPE & an_instance, - const ::DDS::InstanceHandle_t & instance_handle) + DDS_INSTANCE_HANDLE_T_IN instance_handle) { DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one"); diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.h b/CIAO/connectors/dds4ccm/impl/Writer_T.h index 702401ea965..c2decc71d9c 100644 --- a/CIAO/connectors/dds4ccm/impl/Writer_T.h +++ b/CIAO/connectors/dds4ccm/impl/Writer_T.h @@ -30,7 +30,7 @@ namespace CIAO virtual void write_one ( const VALUE_TYPE& an_instance, - const ::DDS::InstanceHandle_t & instance_handle); + DDS_INSTANCE_HANDLE_T_IN instance_handle); virtual void write_many (const SEQ_VALUE_TYPE& instances); @@ -46,8 +46,8 @@ namespace CIAO private: void write_i (const VALUE_TYPE& datum, - const ::DDS::InstanceHandle_t& instance_handle, - ::CCM_DDS::DataNumber_t index); + DDS_INSTANCE_HANDLE_T_IN instance_handle, + ::CCM_DDS::DataNumber_t index); bool is_coherent_write_; }; diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h index a5bfd5611e5..c73a48c6386 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h @@ -27,7 +27,15 @@ # define CIAO_DDS4CCM_CONTEXT_SWITCH 1 #endif /* CIAO_DDS4CCM_CONTEXT_SWITCH */ +#if (CIAO_DDS4CCM_NDDS==1) #define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t & #define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t - +#define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("length <%d> - isValid <%d>") +#define DDS_INSTANCE_HANDLE_LOG(X) X.length, X.isValid +#elif (CIAO_DDS4CCM_OPENDDS==1) +#define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t +#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t +#define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("<%d>") +#define DDS_INSTANCE_HANDLE_LOG(X) X +#endif #endif /* DDS4CCM_CONF_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index 9eeda2cf038..9a92fee139a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -1,7 +1,7 @@ // $Id$ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ - ciao_output, ccm_stub, dds4ccm_logger, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { + ciao_output, ccm_stub, dds4ccm_logger, dds4ccm_base { dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL macros += BUILDING_DDS_LIB diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h index 3311d6d0a70..f25e1614611 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h @@ -27,7 +27,6 @@ namespace CIAO * @brief Representative (proxy) class for the RTI waitset. * * Implementation of the RTI waitset functionality. - * */ class DDS4CCM_NDDS_Export DDS_WaitSet_i : public virtual ::DDS::WaitSet, @@ -89,7 +88,6 @@ namespace CIAO DDSWaitSet * get_rti_entity (void); /** - * * Used in the Reader in order to check whether whether the * user has supplied the correct handle with the type specific * instance. See Reader_T::read_one_last and the DDS4CCM spec @@ -102,7 +100,7 @@ namespace CIAO * TODO: We actually want this method to be in the DDS4CCM * connector but since we're not allowed to use RTI specific code * there it's located here. - * * + * * 'error' will be true if instance_handle != DDS_HANDLE_NIL and * when instance_handle != lookup_handle. * diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl index d506b4446ac..7bc943d2419 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl @@ -9,6 +9,7 @@ #define LATENCYTT_TEST_BASE_IDL #pragma ndds typesupport "Base/LatencyTT_Test_BaseSupport.h" +#pragma opendds typesupport "Base/LatencyTT_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "LatencyTTTest" diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl index 80da6020c57..07a2889559e 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl @@ -9,6 +9,7 @@ #define THROUGHPUT_BASE_IDL #pragma ndds typesupport "Base/Throughput_BaseSupport.h" +#pragma opendds typesupport "Base/Throughput_Base " const short MAX_DATA_SEQUENCE_LENGTH = 8192; diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl index 80c19976e0b..3afbf57609f 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl @@ -9,6 +9,7 @@ #define CSL_DEADLINETEST_BASE_IDL #pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h" +#pragma opendds typesupport "Base/CSL_DeadlineTest_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc index 176b73314cf..b363171a1b4 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc @@ -84,9 +84,9 @@ project(DDS_CSL_DeadlineTest_Sender_stub) : ccm_stub, dds4ccm_base { } project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub + after += DDS_CSL_DeadlineTest_Sender_lem_stub DDS_CSL_DeadlineTest_Sender_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub sharedname = Sender_exec - libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub + libs += Sender_stub Sender_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub libpaths += ../lib includes += .. libout = ../lib diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl index 829b30a0587..3665e7b0895 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl @@ -9,6 +9,7 @@ #define CSL_QOSTEST_BASE_IDL #pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h" +#pragma opendds typesupport "Base/CSL_QoSTest_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl index 0ca498b542d..fee8ebaf5e9 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl @@ -9,6 +9,7 @@ #define CSL_SRTEST_BASE_IDL #pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h" +#pragma opendds typesupport "Base/CSL_SRTest_BaseSupportImpl.h" struct TestTopic { string key; //@key 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 fe3b049bc59..8aa0259e6f2 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl @@ -9,6 +9,7 @@ #define CSL_USTEST_BASE_IDL #pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h" +#pragma opendds typesupport "Base/CSL_USTest_BaseTypeSupportImpl.h" struct TestTopic { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl index 32be383c4c2..955edf1dada 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl @@ -9,6 +9,7 @@ #define COHERENT_UPDATE_TEST_BASE_IDL #pragma ndds typesupport "Base/CoherentUpdate_Test_BaseSupport.h" +#pragma opendds typesupport "Base/CoherentUpdate_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "CoherentUpdateTest" #pragma DCPS_DATA_KEY "CoherentUpdateTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl index 9f4c18ebbd2..921c64d06f9 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl @@ -9,6 +9,7 @@ #define COHERENT_WRITE_TEST_BASE_IDL #pragma ndds typesupport "Base/CoherentWrite_Test_BaseSupport.h" +#pragma opendds typesupport "Base/CoherentWrite_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "CoherentWriteTest" #pragma DCPS_DATA_KEY "CoherentWriteTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl index a6a9dd8b9a1..1ffc8e939b2 100644 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl +++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl @@ -4,6 +4,7 @@ #define DIFFDIR_IDL #pragma ndds typesupport "DiffDirSupport.h" +#pragma opendds typesupport "DiffDirTypeSupportImpl.h" struct DiffDirType { string value; //@key diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl index 25e73405d06..bd4c14c3832 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl @@ -9,6 +9,7 @@ #define CONTENTFILTEREDTOPIC_TEST_BASE_IDL #pragma ndds typesupport "Base/CFT_Test_BaseSupport.h" +#pragma opendds typesupport "Base/CFT_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "CFTTwoDimensionalTest" #pragma DCPS_DATA_KEY "CFTTwoDimensionalTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl index 1b82760facb..d7d0aa298fc 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl @@ -9,6 +9,7 @@ #define CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_IDL #pragma ndds typesupport "Base/CFTLE_Test_BaseSupport.h" +#pragma opendds typesupport "Base/CFTLE_Test_BaseTypeSupportImpl.h" struct ContentFilteredTopicListenEventTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl index 6cef5731a15..6313e7e8294 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl @@ -9,6 +9,7 @@ #define CFT_EXCEPTION_TEST_BASE_IDL #pragma ndds typesupport "Base/Exception_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Exception_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "CFTExceptionTest" #pragma DCPS_DATA_KEY "CFTExceptionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl index 0e08b809b03..f9dab9efc35 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_TEST_BASE_IDL #pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h" +#pragma opendds typesupport "Base/ReadGet_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "QueryConditionTest" #pragma DCPS_DATA_KEY "QueryConditionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl index 116d7c052e7..2f58852bc9e 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl @@ -9,6 +9,7 @@ #define CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_IDL #pragma ndds typesupport "Base/CFTLS_Test_BaseSupport.h" +#pragma opendds typesupport "Base/CFTLS_Test_BaseTypeSupportImpl.h" struct ContentFilteredTopicListenStateTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp index d76f3570560..c106391b678 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp @@ -15,6 +15,8 @@ namespace CIAO_CFTLS_Test_Sender_Impl StartHandler::StartHandler(Sender_exec_i &callback) : callback_ (callback) { + this->reference_counting_policy ().value + (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } int diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl index 81d03950b3f..9842beeebbf 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl @@ -9,6 +9,7 @@ #define WRITER_BASE_IDL #pragma ndds typesupport "Base/Writer_BaseSupport.h" +#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" struct WriterTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl index a9796c1a587..442c25a1120 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl +++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived.idl @@ -4,6 +4,7 @@ #define NOMODULE_IDL #pragma ndds typesupport "DerivedSupport.h" +#pragma opendds typesupport "DerivedTypeSupportImpl.h" struct DerivedType { string value; //@key diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl index 8527e5392d8..74c68de51f8 100644 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl @@ -9,6 +9,7 @@ #define DOUBLE_NESTED_MODULE_BASE_IDL #pragma ndds typesupport "Base/DNM_BaseSupport.h" +#pragma opendds typesupport "Base/DNM_BaseTypeSupportImpl.h" module X { diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl index d34e3bf965c..0ff92986432 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl @@ -9,6 +9,7 @@ #define EVENT_CONNECTION_TEST_BASE_IDL #pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Event_Connection_Test_BaseTypeSupportImpl.h" struct Event_ConnectionTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl index 3a38fd77ea0..462f10a90c0 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl @@ -9,6 +9,7 @@ #define FIXED_SIZE_STRUCT_EVENT_BASE_IDL #pragma ndds typesupport "Base/FSS_Event_BaseSupport.h" +#pragma opendds typesupport "Base/FSS_Event_BaseTypeSupportImpl.h" struct FixedStructSizeTest { long one; diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl index 754b6320aea..d06592a29d7 100644 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl @@ -9,6 +9,7 @@ #define FIXED_SIZE_STRUCT_STATE_BASE_IDL #pragma ndds typesupport "Base/FSS_State_BaseSupport.h" +#pragma opendds typesupport "Base/FSS_State_BaseTypeSupportImpl.h" struct FixedStructSizeTest { long one; diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl index a7fba1ed8b0..69fccc3435c 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl @@ -9,6 +9,7 @@ #define GET_COMPONENT_EVENT_TEST_BASE_IDL #pragma ndds typesupport "Base/GCE_Test_BaseSupport.h" +#pragma opendds typesupport "Base/GCE_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "GCETest" #pragma DCPS_DATA_KEY "GCETest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl index 6d44a2c5284..8046f1d6d6a 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl @@ -9,6 +9,7 @@ #define GET_COMPONENT_STATE_TEST_BASE_IDL #pragma ndds typesupport "Base/GCS_Test_BaseSupport.h" +#pragma opendds typesupport "Base/GCS_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "GCSTest" #pragma DCPS_DATA_KEY "GCSTest symbol" 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 16be11dfb20..6eaf0158843 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl @@ -9,7 +9,7 @@ #define GETTER_TEST_BASE_IDL #pragma ndds typesupport "Base/Getter_Test_BaseSupport.h" -#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportC.h" +#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "GetterTest" diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl index fe3da7521ff..8761be1672c 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl @@ -9,6 +9,7 @@ #define WRITER_BASE_IDL #pragma ndds typesupport "Base/Writer_BaseSupport.h" +#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "WriterTest" #pragma DCPS_DATA_KEY "WriterTest key" diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl index 19d714f4c12..97b6020e892 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl @@ -9,6 +9,7 @@ #define KEYED_TEST_BASE_IDL #pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Keyed_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "KeyedTest" #pragma DCPS_DATA_KEY "KeyedTest key" diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl index 882902a3e65..dc758d20b36 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl @@ -9,6 +9,7 @@ #define WRITER_BASE_IDL #pragma ndds typesupport "Base/Writer_BaseSupport.h" +#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "WriterTest" #pragma DCPS_DATA_KEY "WriterTest key" diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl index 4519538938c..c11e85ae55f 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl @@ -9,6 +9,7 @@ #define RG_LATEBINDING_BASE_IDL #pragma ndds typesupport "Base/RG_LateBinding_BaseSupport.h" +#pragma opendds typesupport "Base/RG_LateBinding_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "RG_LateBindingTest" #pragma DCPS_DATA_KEY "RG_LateBindingTest key" diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl index 91a0a98c2ac..71795cf639a 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl @@ -9,6 +9,7 @@ #define WU_LATEBINDING_BASE_IDL #pragma ndds typesupport "Base/WU_LateBinding_BaseSupport.h" +#pragma opendds typesupport "Base/WU_LateBinding_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "WU_LateBindingTest" #pragma DCPS_DATA_KEY "WU_LateBindingTest key" diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl index 8fe5f77064d..bb1bcdf020c 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl @@ -9,6 +9,7 @@ #define LISTEN_MANY_BY_MANY_TEST_BASE_IDL #pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h" +#pragma opendds typesupport "Base/LMBM_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "ListenManyByManyTest" #pragma DCPS_DATA_KEY "ListenManyByManyTest key" diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl index 7baa8318a0b..d8e75f32203 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl @@ -9,6 +9,7 @@ #define LISTEN_NOT_ENABLED_TEST_BASE_IDL #pragma ndds typesupport "Base/LNE_Test_BaseSupport.h" +#pragma opendds typesupport "Base/LNE_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "ListenNotEnabledTest" #pragma DCPS_DATA_KEY "ListenNotEnabledTest key" diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl index 337f5e315aa..dae0d0f445f 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl @@ -9,6 +9,7 @@ #define LISTEN_ONE_BY_ONE_TEST_BASE_IDL #pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h" +#pragma opendds typesupport "Base/LOBO_Test_BaseTypeSupportImpl.h" struct ListenOneByOneTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl index 89cde6e7bcb..5ff3ad4546f 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl @@ -9,6 +9,7 @@ #define EVENT_MEMLEAKDETECTION_TEST_BASE_IDL #pragma ndds typesupport "Base/Event_MemLeakDetection_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Event_MemLeakDetection_Test_BaseTypeSupportImpl.h" struct Event_MemLeakDetectionTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl index f0d431b7576..c7ad6003cad 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl @@ -9,6 +9,7 @@ #define STATE_MEMLEAKDETECTION_TEST_BASE_IDL #pragma ndds typesupport "Base/State_MemLeakDetection_Test_BaseSupport.h" +#pragma opendds typesupport "Base/State_MemLeakDetection_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "State_MemLeakDetectionTest" #pragma DCPS_DATA_KEY "State_MemLeakDetectionTest key" diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl index 6c474e999a1..782e4d6b6f4 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl @@ -9,7 +9,7 @@ #define MULTITOPIC_IDL #pragma ndds typesupport "Base/MultiTopic_BaseSupport.h" -#pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportC.h" +#pragma opendds typesupport "Base/MultiTopic_BaseTypeSupportImpl.h" #pragma splice typesupport "Base/MultiTopic_BaseDscpC.h" #pragma DCPS_DATA_TYPE "ShapeType" diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl index 47ce24258cb..05cc65413ce 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl @@ -9,6 +9,7 @@ #define MULTIPLE_TEMP_BASE_IDL #pragma ndds typesupport "Base/MultipleTemp_BaseSupport.h" +#pragma opendds typesupport "Base/MultipleTemp_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopicOne" #pragma DCPS_DATA_KEY "TestTopicOne keyOne" diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl index 5feeb350b2b..31f993dacd5 100644 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl +++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.idl @@ -4,6 +4,7 @@ #define NOMODULE_IDL #pragma ndds typesupport "NoModuleSupport.h" +#pragma opendds typesupport "NoModuleSupportImpl.h" struct NoModuleType { string value; //@key diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl index ba286782860..1f04d6f239f 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl @@ -9,6 +9,7 @@ #define NONCHANGEABLE_BASE_IDL #pragma ndds typesupport "Base/NonChangeable_BaseSupport.h" +#pragma opendds typesupport "Base/NonChangeable_BaseSupportImpl.h" struct NonChangeableTest { string key; diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl index b3a78e5f357..90e779227e6 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl @@ -9,6 +9,7 @@ #define ON_INCONSISTENT_TOPIC_TEST_BASE_IDL #pragma ndds typesupport "Base/OIT_Test_BaseSupport.h" +#pragma opendds typesupport "Base/OIT_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "OIT_Receiver_Topic" #pragma DCPS_DATA_KEY "OIT_Receiver_Topic symbol" diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl index fb3b06af770..27f4cb66ba1 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl @@ -4,6 +4,7 @@ #define OFM_BASE_IDL #pragma ndds typesupport "OFM_BaseSupport.h" +#pragma opendds typesupport "OFM_BaseSupportImpl.h" struct Topic1 { string key_value_topic1; //@key diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl index b8e58573eb4..04c6971eac4 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl @@ -9,6 +9,7 @@ #define ONEFILE_BASE_IDL_ #pragma ndds typesupport "OneFile_BaseSupport.h" +#pragma opendds typesupport "OneFile_BaseSupportImpl.h" struct OneFileTopic { string hello; //@key diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl index 293f2c3a583..35d0e190b6c 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl +++ b/CIAO/connectors/dds4ccm/tests/PSAT/psat_type.idl @@ -8,6 +8,7 @@ #define PSAT_TYPE_IDL #pragma ndds typesupport "psat_typeSupport.h" +#pragma opendds typesupport "psat_typeSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl index ca16d20201b..51e1fdef6a4 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl @@ -9,6 +9,7 @@ #define PSL_DEADLINETEST_BASE_IDL #pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h" +#pragma opendds typesupport "Base/PSL_DeadlineTest_BaseSupportImpl.h" struct TestTopic { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl index 17b6a4e3917..d0f2d8ce29b 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl @@ -9,6 +9,7 @@ #define PSL_SAMPLELOST_BASE_IDL #pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h" +#pragma opendds typesupport "Base/PSL_SampleLost_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl index ca28917fc65..0cf2372d602 100644 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl @@ -9,6 +9,7 @@ #define PORTUSAGE_EVENT_TEST_BASE_IDL #pragma ndds typesupport "Base/PortUsage_Test_BaseSupport.h" +#pragma opendds typesupport "Base/PortUsage_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "PortUsageTest" #pragma DCPS_DATA_KEY "PortUsageTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl index 6c3b0149136..2e1aac9c536 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl @@ -9,6 +9,7 @@ #define PROXY_RW_TEST_BASE_IDL #pragma ndds typesupport "Base/Proxy_RW_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Proxy_RW_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "ProxyReadWriteTest" #pragma DCPS_DATA_KEY "ProxyReadWriteTest key" diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl index 23ac9f23301..09c350641fd 100644 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl @@ -9,6 +9,7 @@ #define QOSPROFILE_TEST_BASE_IDL #pragma ndds typesupport "Base/QosProfile_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QosProfile_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "QosProfileTest" #pragma DCPS_DATA_KEY "QosProfileTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl index 8bc2c30ba2f..2543a05ca73 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl @@ -9,6 +9,7 @@ #define DIFFERENT_TEST_BASE_IDL #pragma ndds typesupport "Base/Different_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Different_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "QueryConditionTest" #pragma DCPS_DATA_KEY "QueryConditionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl index 819f3481636..f0cfad01c96 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_IDL #pragma ndds typesupport "Base/QCLE_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QCLE_Test_BaseSupportImpl.h" struct QueryConditionListenEventTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl index 0e08b809b03..ca9957c6b88 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_TEST_BASE_IDL #pragma ndds typesupport "Base/ReadGet_Test_BaseSupport.h" +#pragma opendds typesupport "Base/ReadGet_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "QueryConditionTest" #pragma DCPS_DATA_KEY "QueryConditionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl index bf00e85b0f9..2e37c228138 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_LISTEN_STATE_TEST_BASE_IDL #pragma ndds typesupport "Base/QCLS_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QCLS_Test_BaseSupportImpl.h" struct QueryConditionListenStateTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl index 3c799db3c30..8ea6adb6fa8 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_IDL #pragma ndds typesupport "Base/QCTL_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QCTL_Test_BaseSupportImpl.h" struct QueryConditionTwoListenersTest { string key; //@key diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl index b417cb3cfc3..bac35498db8 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_TEST_BASE_IDL #pragma ndds typesupport "Base/QCTQ_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QCTQ_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "QueryConditionTest" #pragma DCPS_DATA_KEY "QueryConditionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl index bcf2dda3115..d4ba3defc20 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl @@ -9,6 +9,7 @@ #define QUERY_CONDITION_TEST_BASE_IDL #pragma ndds typesupport "Base/QCTQM_Test_BaseSupport.h" +#pragma opendds typesupport "Base/QCTQM_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "QueryConditionTest" #pragma DCPS_DATA_KEY "QueryConditionTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl index 8d2c467acec..9c0d5c7128c 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl @@ -9,6 +9,7 @@ #define READER_TEST_BASE_IDL #pragma ndds typesupport "Base/Reader_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Reader_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "ReaderTest" #pragma DCPS_DATA_KEY "ReaderTest key" diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl index dc4f13b6f93..d614bcd05f3 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl @@ -9,6 +9,7 @@ #define SL_DISABLED_BASE_IDL #pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h" +#pragma opendds typesupport "Base/SL_Disabled_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl index a1ef6e34f42..a843d455057 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl @@ -9,6 +9,7 @@ #define SL_MANYBYMANY_BASE_IDL #pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h" +#pragma opendds typesupport "Base/SL_ManyByMany_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl index eae516f7136..91cef60b9ff 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl @@ -9,6 +9,7 @@ #define SL_ONEBYONE_BASE_IDL #pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h" +#pragma opendds typesupport "Base/SL_OneByOne_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl index 94d30cd743c..7d1df756577 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl @@ -9,6 +9,7 @@ #define SETCONNECTORATTRIBUTE_BASE_IDL #pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h" +#pragma opendds typesupport "Base/SetConnectorAttribute_BaseSupportImpl.h" struct SetConnectorAttributeTest { string key; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl index 11bcfb8cf8a..25732aee86f 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl @@ -9,6 +9,7 @@ #define BASE_IDL #pragma ndds typesupport "Base/BaseSupport.h" +#pragma opendds typesupport "Base/BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "SharedDPTest1" #pragma DCPS_DATA_KEY "SharedDPTest1 key1" diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl index 91ccce681ee..5236fadd49d 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl @@ -9,6 +9,7 @@ #define BASE_IDL #pragma ndds typesupport "Base/BaseSupport.h" +#pragma opendds typesupport "Base/BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "SharedDPTest" #pragma DCPS_DATA_KEY "SharedDPTest key" diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl index a55a8a9106f..ba720cf1478 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl @@ -9,6 +9,7 @@ #define STATE_CONNECTION_TEST_BASE_IDL #pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h" +#pragma opendds typesupport "Base/State_Connection_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "State_ConnectionTest" #pragma DCPS_DATA_KEY "State_ConnectionTest key" diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl index fa65781b88e..ee67b0aedf4 100644 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl @@ -9,6 +9,7 @@ #define TOPICNAME_TEST_BASE_IDL #pragma ndds typesupport "Base/TopicName_Test_BaseSupport.h" +#pragma opendds typesupport "Base/TopicName_Test_BaseSupportImpl.h" #pragma DCPS_DATA_TYPE "TopicNameTest" #pragma DCPS_DATA_KEY "TopicNameTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl index 431b831632b..3a09134fd82 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl @@ -9,6 +9,7 @@ #define TWOTOPICS_BASE_IDL #pragma ndds typesupport "Base/TwoTopics_BaseSupport.h" +#pragma opendds typesupport "Base/TwoTopics_BaseTypeSupportImpl.h" struct HelloTopic { string hello; //@key diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl index c541074eacf..d170b032f2c 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl @@ -17,6 +17,8 @@ #pragma ciao lem "Connector/ConnectorE.idl" #pragma ndds typesupport "Hello/HelloGoodbyeSupport.h" #pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h" +#pragma opendds typesupport "Hello/HelloGoodbyeTypeSupportImpl.h" +#pragma opendds typesupport "Goodbye/HelloGoodbyeTypeSupportImpl.h" module Hello { diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl index 03b2b1d664b..621d44d20d2 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl @@ -9,6 +9,7 @@ #define UNKEYED_TEST_BASE_IDL #pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h" +#pragma opendds typesupport "Base/Unkeyed_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "UnkeyedTest" #pragma DCPS_DATA_KEY "UnkeyedTest key" diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl index 938b96c382d..9841ef54e9e 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl @@ -9,6 +9,7 @@ #define WRITER_BASE_IDL #pragma ndds typesupport "Base/Writer_BaseSupport.h" +#pragma opendds typesupport "Base/Writer_BaseTypeSupportImpl.h" typedef sequence<octet> OctetSeq; diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl index aac765bc8dd..98a74035a21 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl @@ -9,6 +9,7 @@ #define UPDATER_BASE_IDL #pragma ndds typesupport "Base/Updater_BaseSupport.h" +#pragma opendds typesupport "Base/Updater_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "TestTopic" #pragma DCPS_DATA_KEY "TestTopic key" diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl index 8ecade63d40..060d03f78cb 100644 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl @@ -9,6 +9,7 @@ #define USERDATA_COPY_COUNT_TEST_BASE_IDL #pragma ndds typesupport "Base/UCC_Test_BaseSupport.h" +#pragma opendds typesupport "Base/UCC_Test_BaseTypeSupportImpl.h" #pragma DCPS_DATA_TYPE "UCCVariableSizedStructTest" #pragma DCPS_DATA_KEY "UCCVariableSizedStructTest symbol" diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl index 6c6c1873aa7..097ef74b6de 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl @@ -9,6 +9,7 @@ #define VTOPIC_BASE_IDL #pragma ndds typesupport "Base/VTopic_BaseSupport.h" +#pragma opendds typesupport "Base/VTopic_BaseTypeSupportImpl.h" typedef octet octet_array[5]; diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl index b2fc8c73ad3..b8780b7ad7f 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl @@ -9,6 +9,7 @@ #define VTOPICS_BASE_IDL #pragma ndds typesupport "Base/VTopics_BaseSupport.h" +#pragma opendds typesupport "Base/VTopics_BaseTypeSupportImpl.h" typedef octet octet_array[5]; diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl index b0938ca88b6..9a59a3a621d 100755 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl @@ -4,7 +4,7 @@ #define SHAPES_SHAPETYPE_MSG_IDL_ #pragma ndds typesupport "Shapes_ShapeType_msgSupport.h" -#pragma opendds typesupport "Shapes_ShapeType_msgTypeSupportC.h" +#pragma opendds typesupport "Shapes_ShapeType_msgTypeTypeSupportImpl.h" #pragma splice typesupport "Shapes_ShapeType_msgDscpC.h" #pragma DCPS_DATA_TYPE "ShapeType_msg" |