diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-17 10:13:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-03-17 10:13:33 +0000 |
| commit | 5184833205a3ac5d5094d8d86495ddee922f9636 (patch) | |
| tree | a0bbcb6cbc688fd5345fa645260a1a28981c8e7b | |
| parent | 72b094997142d8592f7e0c30e2d1dc48e08f57ff (diff) | |
| download | ATCD-5184833205a3ac5d5094d8d86495ddee922f9636.tar.gz | |
Thu Mar 18 10:12:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
* connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
* connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
* connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
* connectors/dds4ccm/impl/dds/DataReader.cpp
* connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp
* connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp
* connectors/dds4ccm/impl/dds/DataWriter.cpp
* connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp
* connectors/dds4ccm/impl/dds/DDS_Get_T.cpp
* connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp
* connectors/dds4ccm/impl/dds/DDS_Read_T.cpp
* connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp
* connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp
* connectors/dds4ccm/impl/dds/DDS_Update_T.cpp
* connectors/dds4ccm/impl/dds/DDS_Write_T.cpp
* connectors/dds4ccm/impl/dds/DomainParticipant.cpp
* connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp
* connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp
* connectors/dds4ccm/impl/dds/Publisher.cpp
* connectors/dds4ccm/impl/dds/PublisherListener_T.cpp
* connectors/dds4ccm/impl/dds/QueryCondition.cpp
* connectors/dds4ccm/impl/dds/Subscriber.cpp
* connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp
* connectors/dds4ccm/impl/dds/Topic.cpp
* connectors/dds4ccm/impl/dds/TopicDescription.cpp
* connectors/dds4ccm/impl/dds/TopicListener_T.cpp
* connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
* connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
* connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
* connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
* connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
* connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
* connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
* connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
* connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
* connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
* connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp
* connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
* connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
* connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
* connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
* connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
* connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
* connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp
* connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp
* connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp
* connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
* connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
* connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp
* connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
* connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
* connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
* connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp
* connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp
* connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
* connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
Make sure we get the global CORBA namespace
70 files changed, 288 insertions, 220 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 0bedbb7eec2..f7b90ab8735 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,76 @@ +Thu Mar 18 10:12:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp + * connectors/dds4ccm/impl/dds/DataReader.cpp + * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp + * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp + * connectors/dds4ccm/impl/dds/DataWriter.cpp + * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp + * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp + * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp + * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp + * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp + * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp + * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp + * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp + * connectors/dds4ccm/impl/dds/DomainParticipant.cpp + * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp + * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp + * connectors/dds4ccm/impl/dds/Publisher.cpp + * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp + * connectors/dds4ccm/impl/dds/QueryCondition.cpp + * connectors/dds4ccm/impl/dds/Subscriber.cpp + * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp + * connectors/dds4ccm/impl/dds/Topic.cpp + * connectors/dds4ccm/impl/dds/TopicDescription.cpp + * connectors/dds4ccm/impl/dds/TopicListener_T.cpp + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp + * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp + * connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp + * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp + * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp + * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp + * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp + * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp + * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp + * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp + * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp + * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp + * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp + Make sure we get the global CORBA namespace + Thu Mar 18 09:42:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp index eaa74e8af2f..4ffc0d8efd1 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp @@ -253,7 +253,7 @@ namespace CIAO_Hello_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp index 9b714733acb..207c31932a8 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp @@ -311,7 +311,7 @@ namespace CIAO_Quoter_Broker_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_DEBUG ((LM_DEBUG, "Error: Listener control receptacle is null!\n")); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp index b8a2edad663..a1539a5aa0b 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp @@ -135,7 +135,7 @@ namespace CIAO_Quoter_Distributor_Impl if (i->second->current < i->second->low) i->second->low = i->second->current; - if (!CORBA::is_nil (this->writer_)) { + if (! ::CORBA::is_nil (this->writer_)) { ACE_DEBUG ((LM_DEBUG, "WRITE AND CREATE stock_info for <%C> %u:%u:%u\n", i->first.c_str (), i->second->low, diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp index 329c1a99277..1497f0fa120 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp @@ -322,7 +322,7 @@ namespace CIAO_Shapes_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp index 9dbf4ae0eb2..bc8d9ce5ca7 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp @@ -176,7 +176,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void) DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate"); try { - if (CORBA::is_nil (this->domainparticipantlistener_.in ())) + if (::CORBA::is_nil (this->domainparticipantlistener_.in ())) { ACE_NEW_THROW_EX (this->domainparticipantlistener_, DomainParticipantListener( diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp index 224141ab7d3..374b2234085 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Get_T.cpp @@ -31,7 +31,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete ( try { - if (CORBA::is_nil (this->data_reader_.in ())) + if (::CORBA::is_nil (this->data_reader_.in ())) { ::DDS::DataReader_var reader; if (profile_name && library_name) @@ -77,7 +77,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::activate ( DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::activate"); try { - if (CORBA::is_nil (this->status_.in ())) + if (::CORBA::is_nil (this->status_.in ())) { ACE_NEW_THROW_EX (this->status_, PortStatusListener (listener, reactor), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp index a1fed46fcf3..7c5f1159b1b 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp @@ -16,7 +16,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> DDS_Listen_T<DDS_TYPE, CCM_TYPE>::DDS_Listen_T (void) : data_control_ (new CCM_DDS_DataListenerControl_T - < ::CCM_DDS::CCM_DataListenerControl> ()), + < ::CCM_DDS::CCM_DataListenerControl> ()), ccm_dds_reader_ (0) { } @@ -38,7 +38,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( try { - if (CORBA::is_nil (this->data_reader_.in ())) + if (::CORBA::is_nil (this->data_reader_.in ())) { ::DDS::DataReader_var reader; if (library_name && profile_name) @@ -84,7 +84,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate ( DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate"); try { - if (CORBA::is_nil (this->data_listener_.in ())) + if (::CORBA::is_nil (this->data_listener_.in ())) { ACE_NEW_THROW_EX (this->data_listener_, DataReaderListener ( diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp index 26a135d3975..cfff1e15699 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Read_T.cpp @@ -33,7 +33,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( try { - if (CORBA::is_nil (this->data_.in ())) + if (::CORBA::is_nil (this->data_.in ())) { ::DDS::DataReader_var reader; if (profile_name && library_name) @@ -79,7 +79,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate ( try { - if (CORBA::is_nil (this->status_.in ())) + if (::CORBA::is_nil (this->status_.in ())) { ACE_NEW_THROW_EX (this->status_, PortStatusListener (listener, reactor), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp index 0174e5f7e50..978a26352ea 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp @@ -33,7 +33,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( try { - if (CORBA::is_nil (this->data_reader_.in ())) + if (::CORBA::is_nil (this->data_reader_.in ())) { ::DDS::DataReader_var reader; if (library_name && profile_name) @@ -79,7 +79,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::activate ( try { - if (CORBA::is_nil (this->data_listener_.in ())) + if (::CORBA::is_nil (this->data_listener_.in ())) { ACE_NEW_THROW_EX (this->data_listener_, DataReaderStateListener ( diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp index 5fb5b21411d..9e956db57a9 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.cpp @@ -140,7 +140,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_topic (void) { DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_default_topic"); - if (CORBA::is_nil (this->topic_)) + if (::CORBA::is_nil (this->topic_)) { try { @@ -195,7 +195,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_subscriber (void) { DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_subscriber"); - if (CORBA::is_nil (this->subscriber_.in ())) + if (::CORBA::is_nil (this->subscriber_.in ())) { try { @@ -233,7 +233,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_publisher (void) { DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_publisher"); - if (CORBA::is_nil (this->publisher_.in ())) + if (::CORBA::is_nil (this->publisher_.in ())) { if (this->library_name_ && this->profile_name_) { @@ -263,7 +263,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_default_topic (ACE_React DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_default_topic"); try { - if (CORBA::is_nil (this->topiclistener_.in ())) + if (::CORBA::is_nil (this->topiclistener_.in ())) { ACE_NEW_THROW_EX (this->topiclistener_, TopicListener ( @@ -292,7 +292,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_subscriber (ACE_Reactor* try { - if (CORBA::is_nil (this->subscriber_listener_.in ())) + if (::CORBA::is_nil (this->subscriber_listener_.in ())) { ACE_NEW_THROW_EX (this->subscriber_listener_, SubscriberListener ( @@ -321,7 +321,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_publisher (ACE_Reactor* try { - if (CORBA::is_nil (this->publisher_listener_.in ())) + if (::CORBA::is_nil (this->publisher_listener_.in ())) { ACE_NEW_THROW_EX (this->publisher_listener_, PublisherListener ( diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp index c772f4fd8a9..790d4731c8d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Update_T.cpp @@ -28,7 +28,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( const char* profile_name) { DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete"); - if (CORBA::is_nil (this->data_writer_.in ())) + if (::CORBA::is_nil (this->data_writer_.in ())) { try { @@ -72,7 +72,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate () DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate"); try { - if (CORBA::is_nil (this->data_listener_.in ())) + if (::CORBA::is_nil (this->data_listener_.in ())) { ACE_NEW_THROW_EX (this->data_listener_, DataWriterListener (), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp index f628d5a9829..6aa608626da 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DDS_Write_T.cpp @@ -31,7 +31,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete ( try { - if (CORBA::is_nil (this->data_writer_.in ())) + if (::CORBA::is_nil (this->data_writer_.in ())) { ::DDS::DataWriter_var dwv_tmp; if (library_name && profile_name) @@ -72,7 +72,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate () DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate"); try { - if (CORBA::is_nil (this->data_listener_.in ())) + if (::CORBA::is_nil (this->data_listener_.in ())) { ACE_NEW_THROW_EX (this->data_listener_, DataWriterListener (), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp index c596702eada..32af7c110fa 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DataReader.cpp @@ -59,7 +59,7 @@ namespace CIAO } #else ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) + if (! ::CORBA::is_nil (sc.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc.in ()), @@ -105,7 +105,7 @@ namespace CIAO } #else ::DDS::ReadCondition_var rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states); - if (!CORBA::is_nil (rc.in ())) + if (! ::CORBA::is_nil (rc.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc.in ()), @@ -148,7 +148,7 @@ namespace CIAO query_expression, query_parameters); - if (!CORBA::is_nil (qc.in ())) + if (! ::CORBA::is_nil (qc.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_QueryCondition_i (qc.in ()), @@ -216,7 +216,7 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) CCM_DDS_DataReaderListener_i *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_drl, CCM_DDS_DataReaderListener_i (a_listener), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp index b1048c86b0c..c3c2171e8b8 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp @@ -30,7 +30,7 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS { DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available"); - if (!CORBA::is_nil (this->control_.in ()) && this->control_->mode () != ::CCM_DDS::NOT_ENABLED) + if (! ::CORBA::is_nil (this->control_.in ()) && this->control_->mode () != ::CCM_DDS::NOT_ENABLED) { if (this->reactor_) { @@ -56,7 +56,7 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (:: { DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i"); - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + if (::CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) { return; } @@ -159,7 +159,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( typename CCM_TYPE::listener_type::_ptr_type listener) { - if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (listener) || CIAO_debug_level >= 10) { return ::DDS::DATA_AVAILABLE_STATUS | ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp index 0a9214f43b5..b2f2037fe90 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp @@ -33,7 +33,7 @@ void CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr) { DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available"); - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + if (::CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) return; else { @@ -60,7 +60,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_ { DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i"); - if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) + if (::CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED) return; ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd = @@ -230,7 +230,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( typename CCM_TYPE::statelistener_type::_ptr_type listener) { - if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (listener) || CIAO_debug_level >= 10) { return ::DDS::DATA_AVAILABLE_STATUS | ::DDS::REQUESTED_DEADLINE_MISSED_STATUS | diff --git a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp index 83fe91aae23..e417f749e2f 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DataWriter.cpp @@ -51,8 +51,7 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) ::DDS_DataWriterQos ccm_dds_qos; ccm_dds_qos <<= qos; - ::DDS::ReturnCode_t retcode = - this->impl()->get_qos (ccm_dds_qos); + ::DDS::ReturnCode_t retcode = this->impl()->get_qos (ccm_dds_qos); qos <<= ccm_dds_qos; return retcode; #else @@ -64,18 +63,14 @@ namespace CIAO CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener, ::DDS::StatusMask mask) { -#if (CIAO_DDS4CCM_NDDS==1) CCM_DDS_DataWriterListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_DataWriterListener_i (a_listener), CORBA::NO_MEMORY ()); } return this->impl ()->set_listener (ccm_dds_impl_list, mask); -#else - return this->impl ()->set_listener (a_listener, mask); -#endif } ::DDS::DataWriterListener_ptr diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp index ff75d7a61d7..97e69976e5e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipant.cpp @@ -54,7 +54,7 @@ namespace CIAO DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - " "Creating Publisher\n")); CCM_DDS_PublisherListener_i *ccm_dds_pl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_pl, CCM_DDS_PublisherListener_i (a_listener), @@ -103,7 +103,7 @@ namespace CIAO DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT; CCM_DDS_PublisherListener_i *ccm_dds_pl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_pl, CCM_DDS_PublisherListener_i (a_listener), @@ -183,7 +183,7 @@ namespace CIAO "Creating Subscriber\n")); CCM_DDS_SubscriberListener_i *ccm_dds_sl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_sl, CCM_DDS_SubscriberListener_i (a_listener), @@ -231,7 +231,7 @@ namespace CIAO "Creating Subscriber\n")); CCM_DDS_SubscriberListener_i *ccm_dds_sl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_sl, CCM_DDS_SubscriberListener_i (a_listener), @@ -317,7 +317,7 @@ namespace CIAO } #else ::DDS::Subscriber_var sub = this->impl ()->get_builtin_subscriber (); - if (!CORBA::is_nil (sub.in ())) + if (! ::CORBA::is_nil (sub.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_Subscriber_i (sub.in ()), @@ -360,7 +360,7 @@ namespace CIAO impl_name, type_name)); CCM_DDS_TopicListener_i *ccm_dds_tl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_tl, CCM_DDS_TopicListener_i (a_listener), @@ -370,7 +370,7 @@ namespace CIAO DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT; ::DDS::TopicDescription_var td = this->lookup_topicdescription (impl_name); - if (CORBA::is_nil (td)) + if (::CORBA::is_nil (td)) { DDSTopic *ccm_dds_topic = this->impl ()->create_topic (impl_name, type_name, @@ -445,10 +445,10 @@ namespace CIAO impl_name, type_name)); ::DDS::TopicDescription_var td = this->lookup_topicdescription (impl_name); - if (CORBA::is_nil (td)) + if (::CORBA::is_nil (td)) { CCM_DDS_TopicListener_i *ccm_dds_tl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_tl, CCM_DDS_TopicListener_i (a_listener), @@ -510,10 +510,10 @@ namespace CIAO ::DDS::TopicDescription_var td = lookup_topicdescription (ACE_TEXT ("DDS4CCMContentFilteredTopic")); - if (!CORBA::is_nil (td.in ())) + if (! ::CORBA::is_nil (td.in ())) { ::DDS::ContentFilteredTopic_var cft = ::DDS::ContentFilteredTopic::_narrow (td.in ()); - if (!CORBA::is_nil (cft.in ())) + if (! ::CORBA::is_nil (cft.in ())) { ::DDS::ReturnCode_t const ret = this->delete_contentfilteredtopic (cft.in ()); if (ret != ::DDS::RETCODE_OK) @@ -558,7 +558,7 @@ namespace CIAO } #else ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout); - if (!CORBA::is_nil (topic.in ()) + if (! ::CORBA::is_nil (topic.in ()) { ACE_NEW_RETURN (retval, CCM_DDS_Topic_i (topic.in ()), @@ -753,7 +753,7 @@ namespace CIAO { #if (CIAO_DDS4CCM_NDDS==1) CCM_DDS_DomainPublisherListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_DomainPublisherListener_i (a_listener), @@ -1015,7 +1015,7 @@ namespace CIAO } #else ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) + if (! ::CORBA::is_nil (sc.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc.in ()), diff --git a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp index 25077c15179..3bb4d7eb274 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp @@ -47,7 +47,7 @@ namespace CIAO domain_id)); CCM_DDS_DomainPublisherListener_i *ccm_dds_dpl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_dpl, CCM_DDS_DomainPublisherListener_i (a_listener), @@ -123,7 +123,7 @@ namespace CIAO "Creating domain participant: profile <%C#%C> - domain <%d>\n", library_name, profile_name, domain_id)); CCM_DDS_DomainPublisherListener_i *ccm_dds_dpl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_dpl, CCM_DDS_DomainPublisherListener_i (a_listener), diff --git a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp index 02c81857d3e..d2f6c3d9a4e 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp @@ -37,7 +37,7 @@ CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_requested_deadline_m status.total_count, status.total_count_change, status.last_instance_handle.length, status.last_instance_handle.isValid)); - if (!CORBA::is_nil (this->port_status_listener_)) + if (! ::CORBA::is_nil (this->port_status_listener_)) { try { @@ -87,7 +87,7 @@ CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_sample_lost ( ACE_TEXT ("total count <%d> - total change <%d>\n"), status.total_count, status.total_count_change)); - if (!CORBA::is_nil (this->port_status_listener_)) + if (! ::CORBA::is_nil (this->port_status_listener_)) { try { @@ -170,7 +170,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( ::CCM_DDS::PortStatusListener_ptr psl) { - if (!CORBA::is_nil (psl) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (psl) || CIAO_debug_level >= 10) { return DDS_REQUESTED_DEADLINE_MISSED_STATUS | DDS_SAMPLE_LOST_STATUS; diff --git a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp index 8eab87c636c..ce7d0761bcc 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/Publisher.cpp @@ -54,7 +54,7 @@ namespace CIAO } DDSDataWriterListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_drl, CCM_DDS_DataWriterListener_i (a_listener), @@ -114,7 +114,7 @@ namespace CIAO } DDSDataWriterListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_drl, CCM_DDS_DataWriterListener_i (a_listener), @@ -244,7 +244,7 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) CCM_DDS_PublisherListener_i *ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_PublisherListener_i (a_listener), diff --git a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp index 38b1aa970fb..3c09eff06ad 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/PublisherListener_T.cpp @@ -32,7 +32,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_unexpected_status ( { DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status"); - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -84,7 +84,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_miss status.last_instance_handle.length, status.last_instance_handle.isValid)); - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -141,7 +141,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_ status.policies[i].count)); } - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -241,10 +241,10 @@ template <typename DDS_TYPE, typename CCM_TYPE> CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( ::CCM_DDS::ConnectorStatusListener_ptr error_listener) { - if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) { return DDS_STATUS_MASK_ALL; -/* +/* ::DDS::OFFERED_DEADLINE_MISSED_STATUS | ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS | #if (CIAO_DDS4CCM_NDDS==1) diff --git a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp index 4019bc99061..3209ccc6149 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/QueryCondition.cpp @@ -61,7 +61,7 @@ namespace CIAO } #else ::DDS::DataReader_var reader = this->impl ()->get_datareader (); - if (!CORBA::is_nil (reader.in ())) + if (! ::CORBA::is_nil (reader.in ())) { ACE_NEW_THROW_EX (dds_reader, CCM_DDS_DataReader_i (reader.in ()), diff --git a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp index 51f57c7b4b1..e46c02d235d 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/Subscriber.cpp @@ -53,7 +53,7 @@ namespace CIAO } #else ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition (); - if (!CORBA::is_nil (sc.in ())) + if (! ::CORBA::is_nil (sc.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc.in ()), @@ -170,7 +170,7 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader"); ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); DDSDataReaderListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_drl, CCM_DDS_DataReaderListener_i (a_listener), @@ -228,7 +228,7 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile"); ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); DDSDataReaderListener *ccm_dds_drl = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_drl, CCM_DDS_DataReaderListener_i (a_listener), @@ -392,7 +392,7 @@ namespace CIAO DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener"); CCM_DDS_SubscriberListener_i* ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_SubscriberListener_i (a_listener), @@ -443,7 +443,7 @@ namespace CIAO } #else ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in)) + if (! ::CORBA::is_nil (p.in)) { ACE_NEW_THROW_EX (retval, CCM_DDS_DomainParticipant_i (p.in ()), diff --git a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp index bd3e0ef7161..9a6707a1c32 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp @@ -45,7 +45,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_requested_incompatib status.policies[i].count)); } - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -90,7 +90,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_unexpected_status ( { DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status"); - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -167,7 +167,7 @@ CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_sample_rejected ( status.last_instance_handle.length, status.last_instance_handle.isValid)); - if (!CORBA::is_nil (this->error_listener_)) + if (! ::CORBA::is_nil (this->error_listener_)) { try { @@ -262,7 +262,7 @@ template <typename DDS_TYPE, typename CCM_TYPE> CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( ::CCM_DDS::ConnectorStatusListener_ptr csl) { - if (!CORBA::is_nil (csl) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (csl) || CIAO_debug_level >= 10) { return ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS | ::DDS::SAMPLE_REJECTED_STATUS | diff --git a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp index 8e9afc3b51d..d0ce219972a 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/Topic.cpp @@ -59,7 +59,7 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) CCM_DDS_TopicListener_i *ccm_dds_impl_list = 0; - if (!CORBA::is_nil (a_listener)) + if (! ::CORBA::is_nil (a_listener)) { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_TopicListener_i (a_listener), @@ -182,7 +182,7 @@ namespace CIAO } #else ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in ())) + if (! ::CORBA::is_nil (p.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_DomainParticipant_i (p.in ()), diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp index f177c6b01c9..298c3b5c567 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/TopicDescription.cpp @@ -54,7 +54,7 @@ namespace CIAO } #else ::DDS::DomainParticipant_var p = this->impl ()->get_participant (); - if (!CORBA::is_nil (p.in ())) + if (! ::CORBA::is_nil (p.in ())) { ACE_NEW_THROW_EX (retval, CCM_DDS_DomainParticipant_i (p.in ()), diff --git a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp index 96b0a259cb8..b9d60532edb 100644 --- a/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/dds/TopicListener_T.cpp @@ -34,7 +34,7 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::on_inconsistent_topic ( ACE_TEXT ("total count <%d> - total change <%d> - "), status.total_count, status.total_count_change)); - if (!CORBA::is_nil (this->error_listener_.in ())) + if (! ::CORBA::is_nil (this->error_listener_.in ())) { if (this->reactor_) { @@ -66,7 +66,7 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::get_mask ( { DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask"); - if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) + if (! ::CORBA::is_nil (error_listener) || CIAO_debug_level >= 10) { return ::DDS::INCONSISTENT_TOPIC_STATUS; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp index 95ce1539938..a9f7fbce7be 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp @@ -32,7 +32,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl { //only interested in messages received with a latency_ping = -1 ('ping'messages) if( an_instance.latency_ping == -1) - { + { this->callback_.record_time (an_instance.nanotime); } } @@ -49,7 +49,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &matched, int number_of_subscribers, Sender_exec_i &callback) : callback_ (callback), matched_ (matched), - number_of_subscribers_ (number_of_subscribers) + number_of_subscribers_ (number_of_subscribers) { } @@ -93,21 +93,21 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS)) { ::DDS::PublicationMatchedStatus_var stat; DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity); - if(CORBA::is_nil(wr)) + if(::CORBA::is_nil(wr)) { throw ::CORBA::INTERNAL (); } ::DDS::ReturnCode_t retval = wr->get_publication_matched_status(stat.out ()); if (retval == DDS::RETCODE_OK) { - - if((stat.in().current_count >= - (this->number_of_subscribers_ + 1)) && + + if((stat.in().current_count >= + (this->number_of_subscribers_ + 1)) && !this->matched_.value()) { this->matched_ = true; @@ -132,7 +132,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl this->callback_.write_one (); return 0; } - + //============================================================ // Component Executor Implementation Class: Sender_exec_i //============================================================ @@ -182,10 +182,10 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl this->last_key_->second->data_len = this->datalen_; this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_); } - - if((this->iterations_ != 0) && (this->number_of_msg_ >= + + if((this->iterations_ != 0) && (this->number_of_msg_ >= (this->iterations_ * this->keys_))) - { + { this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); this->timer_ = false; } @@ -194,9 +194,9 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl try { this->last_key_->second->seq_num = this->number_of_msg_; - // Send some messages (latency_ping = 1L) with indicator that + // Send some messages (latency_ping = 1L) with indicator that // message has to be returned by the subscriber - // TO DO : use other selection if more then one key is used. + // TO DO : use other selection if more then one key is used. if (( this->number_of_msg_ % this->latency_count_) == 0) { this->last_key_->second->latency_ping = 1L; @@ -208,7 +208,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl this->last_key_->second->latency_ping = 0L; } - this->writer_->write_one (this->last_key_->second, + this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL); } catch (const CCM_DDS::InternalError& ) @@ -238,8 +238,8 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl c = &cd; for (long loop=0; (this->iterations_ == 0)||(loop <this->iterations_); - ++loop ) - { + ++loop ) + { if ( this->spin_ > 0 ) { // spin, spin, spin @@ -247,7 +247,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl *a = 1.1; *b = 3.1415; *c = *a/(*b)*m; - } + } } if( this->number_of_msg_ == 0) { @@ -256,7 +256,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl this->last_key_->second->bin_data = CORBA::string_alloc(0); } - else if( (this->iterations_ != 0) && + else if( (this->iterations_ != 0) && (this->number_of_msg_ == ((this->iterations_ * this->keys_) -1))) { @@ -268,7 +268,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl else { this->last_key_->second->data_len = this->datalen_; - this->last_key_->second->bin_data = + this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_); } try @@ -279,7 +279,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl // if ping required if (( this->number_of_msg_ % this->latency_count_) == 0) { - // send some messages (latency_ping = 1L) with indicator that + // send some messages (latency_ping = 1L) with indicator that // message has to be returned by the subscriber this->last_key_->second->latency_ping = 1L; ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( @@ -306,7 +306,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl ::CCM_DDS::CCM_ConnectorStatusListener_ptr Sender_exec_i::get_connector_status (void) { - return new ConnectorStatusListener_exec_i (this->matched_, + return new ConnectorStatusListener_exec_i (this->matched_, this->number_of_subscribers_, *this); } @@ -342,9 +342,9 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl // this->sleep_ is in ms unsigned int sec = this->sleep_/1000; unsigned int usec = (this->sleep_ % 1000) * 1000; - + // if sleep and spin both > 0, use sleep value and ignore spin value - if(this->sleep_ > 0) // use reactor timer to sleep + if(this->sleep_ > 0) // use reactor timer to sleep { (void) ACE_High_Res_Timer::global_scale_factor (); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr); @@ -357,7 +357,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") ACE_TEXT ("Error scheduling timer"))); } - this->timer_ = true; + this->timer_ = true; } else //use spin i.o sleep { @@ -366,15 +366,15 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl } } -void +void Sender_exec_i::record_time (unsigned long long nanotime) { ACE_UINT64 testend; ACE_High_Res_Timer::gettimeofday_hr ().to_usec (testend); ACE_UINT64 interval = (testend - nanotime); - + ++this->count_; - long duration = static_cast <CORBA::Long>(interval); + long duration = static_cast <CORBA::Long>(interval); this->tv_total_ += duration; if (duration > this->tv_max_.value ()|| (this->tv_max_.value () == 0L)) this->tv_max_ = duration; @@ -472,7 +472,7 @@ Sender_exec_i::record_time (unsigned long long nanotime) { if(datalen <= OVERHEAD_BYTES) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: datalen has to be bigger as %u\n"), OVERHEAD_BYTES)); throw ::CORBA::BAD_PARAM (); @@ -516,7 +516,7 @@ Sender_exec_i::record_time (unsigned long long nanotime) } catch (...) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate:" " Unknown exception caught\n"))); } @@ -527,13 +527,13 @@ Sender_exec_i::record_time (unsigned long long nanotime) { if (this->timer_.value ()) this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - + } void Sender_exec_i::ccm_remove (void) { - + ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n", (this->number_of_msg_ + 1))); @@ -543,7 +543,7 @@ Sender_exec_i::record_time (unsigned long long nanotime) ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER latency time-one way,in usec :\n" "Total time<%u>,\nNumber of latency messages <%u>," "\nAvg <%6.01f>,\nMin <%u>,\nMax <%u>.\n", - this->tv_total_.value ()/2, + this->tv_total_.value ()/2, this->count_.value (), avg/2, this->tv_min_.value ()/2, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp index 4722e431cd6..0ba61e8b014 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp @@ -98,11 +98,11 @@ namespace CIAO_Latency_Test_Sender_Impl ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS)) { DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity); - if(CORBA::is_nil(wr)) + if(::CORBA::is_nil(wr)) { throw ::CORBA::INTERNAL (); } diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp index 1d907810e23..cc2cb46e7f4 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/Sender/LatencyTT_Test_Sender_exec.cpp @@ -31,7 +31,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl { ACE_UINT64 receive_time = 0; - // Only interested in messages received with a latency_ping = 0 + // Only interested in messages received with a latency_ping = 0 // (messages sent back by receiver) if( an_instance.ping == 0) { @@ -50,8 +50,8 @@ namespace CIAO_LatencyTT_Test_Sender_Impl // Facet Executor Implementation Class: ConnectorStatusListener_exec_i //============================================================ ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ( - Atomic_Boolean &matched, - int number_of_subscribers, + Atomic_Boolean &matched, + int number_of_subscribers, Sender_exec_i &callback) : callback_ (callback), matched_ (matched), @@ -84,7 +84,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void ConnectorStatusListener_exec_i::on_offered_deadline_missed( ::DDS::DataWriter_ptr /*the_writer*/, - const DDS::OfferedDeadlineMissedStatus & /*status*/) + const DDS::OfferedDeadlineMissedStatus & /*status*/) { } @@ -99,21 +99,21 @@ namespace CIAO_LatencyTT_Test_Sender_Impl ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS)) { ::DDS::PublicationMatchedStatus_var stat; DDS::DataWriter_var wr = ::DDS::DataWriter::_narrow(the_entity); - if(CORBA::is_nil(wr)) + if(::CORBA::is_nil(wr)) { throw ::CORBA::INTERNAL (); } ::DDS::ReturnCode_t retval = wr->get_publication_matched_status(stat.out ()); if (retval == DDS::RETCODE_OK) { - - if((stat.in().current_count >= - (this->number_of_subscribers_ + 1)) && + + if((stat.in().current_count >= + (this->number_of_subscribers_ + 1)) && !this->matched_.value()) { this->matched_ = true; @@ -157,7 +157,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl timer_(false), received_(false), seq_num_(0), - sigma_duration_squared_(0) + sigma_duration_squared_(0) { this->ticker_ = new WriteTicker (*this); } @@ -183,7 +183,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl if( (this->number_of_msg_ == 0) || ( this->received_.value())) { // All messages send, stop timer. - if((this->iterations_ != 0) && + if((this->iterations_ != 0) && (this->number_of_msg_ >= this->iterations_ )) { if( this->datalen_idx_ >= (this->nr_of_runs_ - 1)) @@ -250,29 +250,29 @@ namespace CIAO_LatencyTT_Test_Sender_Impl this->number_of_msg_ = 0; this->received_ = false; this->seq_num_ = 0; - this->sigma_duration_squared_ = 0; + this->sigma_duration_squared_ = 0; } void Sender_exec_i::calc_results() { // Sort all duration times. - qsort(this->duration_times, + qsort(this->duration_times, this->count_, - sizeof(CORBA::Long), + sizeof(CORBA::Long), compare_two_longs); - // Show latency_50_percentile, latency_90_percentile, + // Show latency_50_percentile, latency_90_percentile, // latency_99_percentile and latency_99.99_percentile. - // For example duration_times[per50] is the median i.e. 50% of the + // For example duration_times[per50] is the median i.e. 50% of the // samples have a latency time <= duration_times[per50] int per50 = this->count_/2; int per90 = (int)(this->count_ * 0.90); int per99 = (int)(this->count_ * 0.990); int per9999 = (int)(this->count_ * 0.9999); - + double avg = this->tv_total_.value () / this->count_; - // Calculate standard deviation. + // Calculate standard deviation. double _roundtrip_time_std = sqrt( (this->sigma_duration_squared_ / (double)this->count_) - (avg * avg)); @@ -433,7 +433,7 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) } void - Sender_exec_i::calculate_clock_overhead() + Sender_exec_i::calculate_clock_overhead() { int num_of_loops_clock = 320; ACE_UINT64 begin_time; @@ -508,7 +508,7 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) } this->init_values(); } - + void Sender_exec_i::stop (void) { @@ -518,7 +518,7 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) delete this->ticker_; } } - + void Sender_exec_i::ccm_passivate (void) { @@ -533,19 +533,19 @@ Sender_exec_i::record_time (ACE_UINT64 receive_time) ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER : %u of %u runs completed.\n" " Number of messages sent of last run (%u): %u\n", (this->datalen_idx_), - this->nr_of_runs_, + this->nr_of_runs_, (this->datalen_idx_ + 1), this->number_of_msg_)); } else { - ACE_UINT64 test_time_usec = this->end_time_test_ - + ACE_UINT64 test_time_usec = this->end_time_test_ - this->start_time_test_; double sec = (double)test_time_usec / (1000 * 1000); ACE_DEBUG ((LM_DEBUG, "TEST successful, number of runs (%u) of " "%u messages in %3.3f seconds.\n", - this->nr_of_runs_, + this->nr_of_runs_, this->number_of_msg_, sec)); } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp index 90af42530ec..77beff2df64 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp @@ -150,7 +150,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp index dc449ddf0b2..5b26849663b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp @@ -52,7 +52,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl const DDS::OfferedDeadlineMissedStatus & status) { this->thread_id_ = ACE_Thread::self (); - if(status.last_instance_handle.isValid && !CORBA::is_nil (the_writer)) + if(status.last_instance_handle.isValid && ! ::CORBA::is_nil (the_writer)) { this->deadline_missed_ = true; } @@ -119,7 +119,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl { try { - if (!CORBA::is_nil (this->writer_) ) + if (! ::CORBA::is_nil (this->writer_) ) { ACE_OS::sleep (2); ::DDS::InstanceHandle_t hnd = this->writer_->register_instance (i->second); diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp index 03105ace930..4aaf672c44f 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp @@ -38,7 +38,7 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl const DDS::RequestedIncompatibleQosStatus & /*status*/) { this->thread_id_ = ACE_Thread::self (); - if(!CORBA::is_nil(the_reader)) + if(! ::CORBA::is_nil(the_reader)) { this->incompatible_ = true; } @@ -159,7 +159,7 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp index 395c139bd99..7f3c7d0192c 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp @@ -58,7 +58,7 @@ namespace CIAO_CSL_QoSTest_Sender_Impl const DDS::OfferedIncompatibleQosStatus & /*status*/) { this->thread_id_ = ACE_Thread::self (); - if(!CORBA::is_nil(the_writer)) + if(! ::CORBA::is_nil(the_writer)) { this->incompatible_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp index e31a3b5cb4f..f901158964a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp @@ -50,7 +50,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl { this->thread_id_ = ACE_Thread::self (); if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT && - !CORBA::is_nil(the_reader)) + ! ::CORBA::is_nil(the_reader)) { this->rejected_ = true; } @@ -156,7 +156,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl void Receiver_exec_i::read_all (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } @@ -269,7 +269,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp index 48569775887..21f0dd45863 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp @@ -49,7 +49,7 @@ namespace CIAO_CSL_SRTest_Sender_Impl { this->thread_id_ = ACE_Thread::self (); if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT && - !CORBA::is_nil(the_reader)) + ! ::CORBA::is_nil(the_reader)) { this->rejected_ = true; } @@ -121,7 +121,7 @@ namespace CIAO_CSL_SRTest_Sender_Impl { try { - if (!CORBA::is_nil (this->writer_)) + if (! ::CORBA::is_nil (this->writer_)) { this->writer_->write_one(i->second,::DDS::HANDLE_NIL); i->second->x++; diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp index 7a672808d25..2995080c1f3 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp @@ -92,17 +92,17 @@ namespace CIAO_CSL_USTest_Receiver_Impl "received <%C>\n", CIAO::DDS4CCM::translate_statuskind (status_kind))); - if (!CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) + if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) { this->subscription_matched_received_ = true; this->thread_id_subcription_matched_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS) { this->liveliness_changed_received_ = true; this->thread_id_liveliness_changed_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) { this->publication_matched_received_ = true; this->thread_id_publication_matched_ = ACE_Thread::self (); @@ -213,7 +213,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl void Receiver_exec_i::stop (void) { - if (CORBA::is_nil (this->lc_.in ())) + if (::CORBA::is_nil (this->lc_.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); } @@ -224,7 +224,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl Receiver_exec_i::start (void) { this->lc_ = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (this->lc_.in ())) + if (::CORBA::is_nil (this->lc_.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); } 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 3b1fcc8eb0c..d322d8e1587 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 @@ -99,27 +99,27 @@ namespace CIAO_CSL_USTest_Sender_Impl "received <%C>\n", CIAO::DDS4CCM::translate_statuskind (status_kind))); - if (!CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) + if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS) { this->subscription_matched_received_ = true; this->thread_id_subcription_matched_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS) { this->liveliness_changed_received_ = true; this->thread_id_liveliness_changed_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS) { this->liveliness_lost_received_ = true; this->thread_id_liveliness_lost_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS) { this->publication_matched_received_ = true; this->thread_id_publication_matched_ = ACE_Thread::self (); } - else if (!CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS) + else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS) { this->reliable_dr_activity_changed_received_ = true; this->thread_id_reliable_dr_activity_changed_ = ACE_Thread::self (); @@ -170,7 +170,7 @@ namespace CIAO_CSL_USTest_Sender_Impl { try { - if (!CORBA::is_nil (this->writer_)) + if (! ::CORBA::is_nil (this->writer_)) { this->writer_->write_one(i->second,::DDS::HANDLE_NIL); ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n", diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp index c6c86acec55..630fce1a987 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp @@ -68,7 +68,7 @@ namespace CIAO_CoherentUpdate_Test_Sender_Impl void Sender_exec_i::start (void) { - if (!CORBA::is_nil (this->starter_)) + if (! ::CORBA::is_nil (this->starter_)) { this->starter_->set_reader_properties (this->iterations_); } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp index 9b500442449..84cef5d00ac 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp @@ -66,7 +66,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl void Sender_exec_i::start (void) { - if (!CORBA::is_nil (this->starter_)) + if (! ::CORBA::is_nil (this->starter_)) { this->starter_->set_reader_properties (this->iterations_); } diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp index cbdb81002d2..ead35d1810c 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp @@ -92,7 +92,7 @@ namespace CIAO_Writer_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp index c28904ad3ac..0c6d1b8087f 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver_exec.cpp @@ -81,19 +81,19 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl //DDS_Get this->getter_getter_ = this->context_->get_connection_info_get_fresh_data (); - if (!CORBA::is_nil (this->getter_getter_)) + if (! ::CORBA::is_nil (this->getter_getter_)) { this->getter_ok_ = true; } this->getter_dds_data_reader_ = this->context_->get_connection_info_get_dds_entity (); - if (!CORBA::is_nil (this->getter_dds_data_reader_)) + if (! ::CORBA::is_nil (this->getter_dds_data_reader_)) { this->getter_dds_data_reader_ok_ = true; } this->getter_reader_ = this->context_->get_connection_info_get_data (); - if (!CORBA::is_nil (this->getter_reader_)) + if (! ::CORBA::is_nil (this->getter_reader_)) { this->getter_reader_ok_ = true; } @@ -101,19 +101,19 @@ namespace CIAO_Event_Connection_Test_Receiver_Impl this->listen_data_control_ = this->context_->get_connection_info_listen_data_control (); - if (!CORBA::is_nil (this->listen_data_control_)) + if (! ::CORBA::is_nil (this->listen_data_control_)) { this->listen_data_control_ok_ = true; } this->listen_reader_ = this->context_->get_connection_info_listen_data (); - if (!CORBA::is_nil (this->listen_reader_)) + if (! ::CORBA::is_nil (this->listen_reader_)) { this->listen_reader_ok_ = true; } this->listen_dds_data_reader_ = this->context_->get_connection_info_listen_dds_entity (); - if (!CORBA::is_nil (this->listen_dds_data_reader_)) + if (! ::CORBA::is_nil (this->listen_dds_data_reader_)) { this->listen_dds_data_reader_ok_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp index 5b728822970..1fb938bcf5e 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender_exec.cpp @@ -35,13 +35,13 @@ namespace CIAO_Event_Connection_Test_Sender_Impl { this->writer_ = this->context_->get_connection_info_write_data (); - if (!CORBA::is_nil (this->writer_)) + if (! ::CORBA::is_nil (this->writer_)) { this->writer_ok_ = true; } this->writer_dds_datawriter_ = this->context_->get_connection_info_write_dds_entity (); - if (!CORBA::is_nil (this->writer_dds_datawriter_)) + if (! ::CORBA::is_nil (this->writer_dds_datawriter_)) { this->writer_dds_datawriter_ok_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp index 17066065f1b..6a23fe57d69 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp @@ -65,7 +65,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl void Receiver_exec_i::read (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp index cbdb81002d2..ead35d1810c 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -92,7 +92,7 @@ namespace CIAO_Writer_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp index 0bf4144aef2..dc3aae339e4 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp @@ -119,7 +119,7 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index 9712f786a78..c026d468209 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -98,12 +98,12 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl ::DDS::DataReader_ptr the_reader, const ::DDS::RequestedDeadlineMissedStatus & status) { - if (this->port_nr_ == 1 && !CORBA::is_nil( the_reader) && status.total_count!= 0) + if (this->port_nr_ == 1 && ! ::CORBA::is_nil( the_reader) && status.total_count!= 0) { this->deadline_port_1_ = true; this->thread_id_1_ = ACE_Thread::self (); } - if (this->port_nr_ == 2 && !CORBA::is_nil (the_reader) && status.total_count!= 0) + if (this->port_nr_ == 2 && ! ::CORBA::is_nil (the_reader) && status.total_count!= 0) { this->deadline_port_2_ = true; this->thread_id_2_ = ACE_Thread::self (); @@ -138,7 +138,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl void Receiver_exec_i::read_all (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } @@ -225,7 +225,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp index 8410cb4a791..e3528d016b5 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp @@ -121,7 +121,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl { try { - if (!CORBA::is_nil (this->writer_)) + if (! ::CORBA::is_nil (this->writer_)) { this->writer_->write_one(i->second,::DDS::HANDLE_NIL); i->second->x++; diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp index bb13571ca80..3129aac9e33 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp @@ -162,14 +162,14 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl } if (this->port_nr_ == 1 && - !CORBA::is_nil(the_reader) && + ! ::CORBA::is_nil(the_reader) && status.total_count > 0) { this->sample_port_1_ = true; } if (this->port_nr_ == 2 && - !CORBA::is_nil(the_reader) && + ! ::CORBA::is_nil(the_reader) && status.total_count > 0) { this->sample_port_2_ = true; @@ -198,7 +198,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl void Receiver_exec_i::read_all (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } @@ -292,7 +292,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp index c426ad1362b..22fc81d2511 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp @@ -118,7 +118,7 @@ namespace CIAO_PSL_SampleLost_Sender_Impl { try { - if (!CORBA::is_nil (this->writer_) ) + if (! ::CORBA::is_nil (this->writer_) ) { this->writer_->write_one(i->second,::DDS::HANDLE_NIL); i->second->x++; diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp index b803057fc9e..28557f43da5 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp @@ -174,7 +174,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl Receiver_exec_i::get_all (void) { #if (DDS4CCM_USES_QUERY_CONDITION==1) - if (CORBA::is_nil (this->getter_)) + if (::CORBA::is_nil (this->getter_)) { ACE_ERROR ((LM_ERROR, "ERROR: No Getter\n")); } @@ -493,7 +493,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl DDS::Duration_t to; to.sec = 5; to.nanosec = 0; - if (!CORBA::is_nil (this->getter_)) + if (! ::CORBA::is_nil (this->getter_)) { this->getter_->time_out (to); } diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp index a67204e0d94..67c33e222d8 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender_exec.cpp @@ -68,7 +68,7 @@ namespace CIAO_QueryFilter_Test_Sender_Impl void Sender_exec_i::start (void) { - if (!CORBA::is_nil (this->starter_)) + if (! ::CORBA::is_nil (this->starter_)) { this->starter_->set_reader_properties (this->keys_, this->iterations_); } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp index 84c329d8f95..84041a46cce 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp @@ -85,7 +85,7 @@ namespace CIAO_Reader_Test_Receiver_Impl { try { - if (!CORBA::is_nil (this->reader_)) + if (! ::CORBA::is_nil (this->reader_)) { ReaderTest readertest_info; ::CCM_DDS::ReadInfo readinfo; diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp index 03f9501151c..242249bbcd2 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp @@ -80,7 +80,7 @@ namespace CIAO_Reader_Test_Sender_Impl if (!this->done_ && this->ccm_activated_) { this->done_ = true; - if (!CORBA::is_nil (this->starter_)) + if (! ::CORBA::is_nil (this->starter_)) { this->starter_->set_reader_properties (this->keys_, this->iterations_); this->starter_->read_no_data (); diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp index 976ce3254b3..e2568d2f2fc 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp @@ -99,7 +99,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl void Receiver_exec_i::read_all (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } @@ -171,7 +171,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl ::CCM_DDS::StateListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp index 909ccc30f8d..bf3bb99ef50 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp @@ -46,7 +46,7 @@ namespace CIAO_SL_Disabled_Sender_Impl TestTopic i = this->topic_seq_one_[0]; try { - if (!CORBA::is_nil (this->updater_) ) + if (! ::CORBA::is_nil (this->updater_) ) { this->updater_->create_one(i); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_Disabled: create_one with instance key <%C>\n"), diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp index a93b9b08f5e..0c3ef155c91 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp @@ -193,7 +193,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl void Receiver_exec_i::read_all (void) { - if (CORBA::is_nil (this->reader_.in ())) + if (::CORBA::is_nil (this->reader_.in ())) { return; } @@ -271,7 +271,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl ::CCM_DDS::StateListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp index 8f43c811c6c..662e1b1326b 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp @@ -46,7 +46,7 @@ namespace CIAO_SL_ManyByMany_Sender_Impl TestTopic i = this->topic_seq_one_[0]; try { - if (!CORBA::is_nil (this->updater_) ) + if (! ::CORBA::is_nil (this->updater_) ) { this->updater_->create_one(i); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_ManyByMany: create_one with instance key <%C>\n"), diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp index 52ce2810872..187138977cf 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp @@ -163,7 +163,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl ::CCM_DDS::StateListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp index 5a871373445..8885fd86841 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp @@ -46,7 +46,7 @@ namespace CIAO_SL_OneByOne_Sender_Impl TestTopic i = this->topic_seq_one_[0]; try { - if (!CORBA::is_nil (this->updater_) ) + if (! ::CORBA::is_nil (this->updater_) ) { this->updater_->create_one(i); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SL_OneByOne: create_one with instance key <%C>\n"), diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp index 7c33db5eb1d..0575753bcb9 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp @@ -109,44 +109,44 @@ namespace CIAO_State_Connection_Test_Receiver_Impl //DDS_Read this->reader_data_ = this->context_->get_connection_info_read_data (); - this->reader_data_ok_ = !CORBA::is_nil (this->reader_data_); + this->reader_data_ok_ = ! ::CORBA::is_nil (this->reader_data_); this->reader_dds_entity_ = this->context_->get_connection_info_read_dds_entity (); - this->reader_dds_entity_ok_ = !CORBA::is_nil (this->reader_dds_entity_); + this->reader_dds_entity_ok_ = ! ::CORBA::is_nil (this->reader_dds_entity_); //DDS_Get this->getter_data_ = this->context_->get_connection_info_get_data (); - this->getter_data_ok_ = !CORBA::is_nil (this->getter_data_); + this->getter_data_ok_ = ! ::CORBA::is_nil (this->getter_data_); this->getter_fresh_data_ = this->context_->get_connection_info_get_fresh_data (); - this->getter_fresh_data_ok_ = !CORBA::is_nil (this->getter_fresh_data_); + this->getter_fresh_data_ok_ = ! ::CORBA::is_nil (this->getter_fresh_data_); this->getter_dds_entity_ = this->context_->get_connection_info_get_dds_entity (); - this->getter_dds_entity_ok_ = !CORBA::is_nil (this->getter_dds_entity_); + this->getter_dds_entity_ok_ = ! ::CORBA::is_nil (this->getter_dds_entity_); //DDS_Listen this->listen_data_ = this->context_->get_connection_info_listen_data (); - this->listen_data_ok_ = !CORBA::is_nil (this->listen_data_); + this->listen_data_ok_ = ! ::CORBA::is_nil (this->listen_data_); this->listen_data_control_ = this->context_->get_connection_info_listen_data_control (); - this->listen_data_control_ok_ = !CORBA::is_nil (this->listen_data_control_); + this->listen_data_control_ok_ = ! ::CORBA::is_nil (this->listen_data_control_); this->listen_dds_entity_ = this->context_->get_connection_info_listen_dds_entity (); - this->listen_dds_entity_ok_ = !CORBA::is_nil (this->listen_dds_entity_); + this->listen_dds_entity_ok_ = ! ::CORBA::is_nil (this->listen_dds_entity_); //DDS_StateListen this->statelisten_data_ = this->context_->get_connection_info_statelisten_data (); - this->statelisten_data_ok_ = !CORBA::is_nil (this->statelisten_data_); + this->statelisten_data_ok_ = ! ::CORBA::is_nil (this->statelisten_data_); this->statelisten_data_control_ = this->context_->get_connection_info_statelisten_data_control (); - this->statelisten_data_control_ok_ = !CORBA::is_nil (this->statelisten_data_control_); + this->statelisten_data_control_ok_ = ! ::CORBA::is_nil (this->statelisten_data_control_); this->statelisten_dds_entity_ = this->context_->get_connection_info_statelisten_dds_entity (); - this->statelisten_dds_entity_ok_ = !CORBA::is_nil (this->statelisten_dds_entity_); + this->statelisten_dds_entity_ok_ = ! ::CORBA::is_nil (this->statelisten_dds_entity_); } void diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp index feb878a783b..8c7b8d82c1a 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender_exec.cpp @@ -42,13 +42,13 @@ namespace CIAO_State_Connection_Test_Sender_Impl { this->updater_ = this->context_->get_connection_info_update_data (); - if (!CORBA::is_nil (this->updater_)) + if (! ::CORBA::is_nil (this->updater_)) { this->updater_ok_ = true; } this->updater_dds_datawriter_ = this->context_->get_connection_info_update_dds_entity (); - if (!CORBA::is_nil (this->updater_dds_datawriter_)) + if (! ::CORBA::is_nil (this->updater_dds_datawriter_)) { this->updater_dds_datawriter_ok_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp index 6f5b5be4214..1eabf7bf90d 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp @@ -188,7 +188,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp index 708513ae92f..114841da9f6 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -123,7 +123,7 @@ namespace CIAO_Writer_Receiver_Impl ::CCM_DDS::DataListenerControl_var lc = this->context_->get_connection_info_out_data_control (); - if (CORBA::is_nil (lc.in ())) + if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); throw CORBA::INTERNAL (); diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp index 389d9e05879..6a594890db2 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp @@ -48,7 +48,7 @@ namespace CIAO_Updater_Sender_Impl TestTopic i = this->topic_seq_one_[0]; try { - if (!CORBA::is_nil (this->updater_) ) { + if (! ::CORBA::is_nil (this->updater_) ) { this->updater_->create_one(i); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: create_one with instance key <%C>\n"), i.key.in())); diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp index 4e9e615db95..86e55d5838c 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp @@ -56,7 +56,7 @@ namespace CIAO_VTopic_Receiver_Impl ::DDS::Entity_ptr the_entity, ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) { this->unexpected_matched_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp index 8a943a144f6..64b2499fa00 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp @@ -54,7 +54,7 @@ namespace CIAO_VTopic_Sender_Impl ::DDS::Entity_ptr the_entity, ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) { this->unexpected_matched_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp index 49f973be0bd..48fdc2712b8 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp @@ -56,7 +56,7 @@ namespace CIAO_VTopics_Receiver_Impl ::DDS::Entity_ptr the_entity, ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) { this->unexpected_matched_ = true; } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp index 2f7eb0014e2..33983c34561 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp @@ -54,7 +54,7 @@ namespace CIAO_VTopics_Sender_Impl ::DDS::Entity_ptr the_entity, ::DDS::StatusKind status_kind) { CORBA::ULong kind = status_kind; - if((!CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) + if((! ::CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS)) { this->unexpected_matched_ = true; } |