diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-08 07:30:51 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-06-08 07:30:51 +0000 |
| commit | a3854719a8bf6af65f0efac5813e003bfdf75d5d (patch) | |
| tree | 126fabe59f26f49cc3be248a99ddc96e1e71ddeb /CIAO/connectors/dds4ccm/tests/VariousTopicsEvent | |
| parent | 95323f3b5cc105ca46a30600a15365038b335ebf (diff) | |
| download | ATCD-a3854719a8bf6af65f0efac5813e003bfdf75d5d.tar.gz | |
Fri Jun 8 07:29:26 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
* connectors/dds4ccm/impl/DomainParticipantManager.h:
Layout change
* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
* connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl:
* connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
* connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl:
OpenDDS doesn't support an union as topic type, use another
type
to get these tests deployed
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/VariousTopicsEvent')
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl | 2 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl index 11cccee7e68..68bd29382fa 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl @@ -24,6 +24,8 @@ module VTopic module ::CCM_DDS::Typed < ::TopicUnion, ::TopicUnionSeq> TopicUnionConnector; #if !defined (CIAO_DDS4CCM_OPENDDS) module ::CCM_DDS::Typed < ::X_Union, ::X_UnionSeq> X_UnionConnector; +#else + module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> X_UnionConnector; #endif }; diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl index 6d1412de1cd..7304f41e55c 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl @@ -19,17 +19,14 @@ # include "Base/VTopic_BaseTypeSupport.idl" #endif -#if !defined (CIAO_DDS4CCM_OPENDDS) module VTopic { +#if !defined (CIAO_DDS4CCM_OPENDDS) module ::CCM_DDS::Typed < ::TopicValuetype, ::TopicValuetypeSeq> TopicValuetypeConnector; -}; #else -module VTopic -{ // Just use another topic, that way we get a connector module ::CCM_DDS::Typed < ::TopicString, ::TopicStringSeq> TopicValuetypeConnector; -}; #endif +}; #endif /* VT_VALUETYPE_CONNECTOR_IDL_ */ |