diff options
author | msmit <msmit@remedy.nl> | 2011-06-14 12:03:22 +0000 |
---|---|---|
committer | msmit <msmit@remedy.nl> | 2011-06-14 12:03:22 +0000 |
commit | aa53935d8fd6022cd2879a609c3f1efafe0ec6d8 (patch) | |
tree | a9c0cbbb92f1652ab2e24a67b7a3e9ef615b6019 | |
parent | f2b3852538c1b045d20fc507104143e6b9850f95 (diff) | |
download | ATCD-aa53935d8fd6022cd2879a609c3f1efafe0ec6d8.tar.gz |
Tue Jun 14 12:03:17 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
Fixed compile issue on openDDS.
-rw-r--r-- | CIAO/ChangeLog | 5 | ||||
-rw-r--r-- | CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index d4448a4a190..a6e51f10e75 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jun 14 12:03:17 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h: + Fixed compile issue on openDDS. + Tue Jun 14 08:46:29 UTC 2011 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h index 30893e23f89..a42b39d00a3 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h @@ -56,7 +56,10 @@ protected: ::DDS::SubscriberListener_var subscriber_listener_; typedef DDS_Base_Connector_T<CCM_TYPE> BaseConnector; + +#if (CIAO_DDS4CCM_NDDS==1) typedef ::CIAO::NDDS::DDS_TypeFactory_T <DDS_TYPE, SEQ_TYPE> dds_type_factory; +#endif private: bool late_binding_; |