diff options
5 files changed, 11 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 482b0fc307f..1623b2d2f66 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Mon May 23 18:24:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc: + Increased portability + Mon May 23 15:07:33 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/PublisherListener.cpp: diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp index 8bf68454151..8ecd1de91f4 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp @@ -139,6 +139,7 @@ namespace CIAO_CSL_USTest_Sender_Impl this->thread_id_publication_matched_ = t_id; } +#if (CIAO_DDS4CCM_NDDS==1) else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS) { this->reliable_dr_activity_changed_received_ = true; @@ -149,6 +150,7 @@ namespace CIAO_CSL_USTest_Sender_Impl this->reliable_writer_cache_changed_received_ = true; this->thread_id_reliable_writer_cache_changed_ = t_id; } +#endif } /** diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp index a63bc83ad00..bc5ccf966ed 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp @@ -29,7 +29,6 @@ #include "tao/ORB_Core.h" #include "ace/Reactor.h" -#include "Base/Writer_BaseSupport.h" #include "Connector/Writer_Connector_conn.h" #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp index 6aae52ac029..38d20f2a635 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp @@ -1,10 +1,8 @@ // -*- C++ -*- -// // $Id$ #include "LOBO_Test_Receiver_exec.h" #include "ace/Log_Msg.h" - #include "dds4ccm/impl/dds4ccm_conf.h" namespace CIAO_LOBO_Test_Receiver_Impl diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc index afb4c079a72..cd08a8d71e8 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -37,7 +37,7 @@ project (DDS_CCM_Example_PSAT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts ccm_dds_psat.idl } - opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export + opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export -I $(CIAO_ROOT)/connectors/dds4ccm/idl ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl DDSGenerator_Files { |