diff options
82 files changed, 345 insertions, 260 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 6534bdabcf7..d7b39fc3c0c 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,88 @@ +Mon Jul 12 09:47:09 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: + * connectors/dds4ccm/impl/ConditionManager_T.cpp: + * connectors/dds4ccm/impl/ContentFilterSetting.cpp: + * connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp: + * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Listen_T.cpp: + * connectors/dds4ccm/impl/DDS_StateListen_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: + * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/DataReader_T.cpp: + * connectors/dds4ccm/impl/DataWriter_T.cpp: + * connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp: + * connectors/dds4ccm/impl/DomainParticipantManager.cpp: + * connectors/dds4ccm/impl/DomainParticipant_T.cpp: + * connectors/dds4ccm/impl/Getter_T.cpp: + * connectors/dds4ccm/impl/Publisher_T.cpp: + * connectors/dds4ccm/impl/QueryCondition_T.cpp: + * connectors/dds4ccm/impl/ReadCondition_T.cpp: + * connectors/dds4ccm/impl/StatusCondition.cpp: + * connectors/dds4ccm/impl/Subscriber_T.cpp: + * connectors/dds4ccm/impl/TopicDescription_T.cpp: + * connectors/dds4ccm/impl/Topic_T.cpp: + * connectors/dds4ccm/impl/Updater_T.cpp: + * connectors/dds4ccm/impl/Writer_T.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp: + * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp: + * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp: + * connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp: + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_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/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: + * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp: + Using :: for namespaces. + Mon Jul 12 09:14:06 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/ContentFilterSetting.cpp: 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 47e30e03cd5..53185c1a21d 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 ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode ( ::CCM_DDS::ONE_BY_ONE); } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp index 1481272ef83..c6d7ed9ad92 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp @@ -295,7 +295,7 @@ namespace CIAO_Quoter_Broker_Impl if (::CORBA::is_nil (lc.in ())) { ACE_DEBUG ((LM_DEBUG, "Error: Listener control receptacle is null!\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } //in case of testing Listener set lc-> enabled true lc->mode ( ::CCM_DDS::ONE_BY_ONE); 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 798d9d60a12..34d79e590ec 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 if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED); diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp index 953003863bc..0f2e773a94c 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.cpp @@ -120,7 +120,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::init_readcon // (including its proxy). ACE_NEW_THROW_EX (this->ws_, DDSWaitSet (), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); if ( ::CORBA::is_nil (this->rd_condition_.in ())) { @@ -144,7 +144,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::init_readcon DDS4CCM_ERROR (1, (LM_ERROR, CLINFO ACE_TEXT ("CIAO::DDS4CCM::ConditionManager_T::init_readcondition - ") ACE_TEXT ("Unable to attach read condition to waitset.\n"))); - throw CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 1); } DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO ACE_TEXT ("CIAO::DDS4CCM::ConditionManager_T::init_readcondition - ") @@ -164,12 +164,12 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::query (void) ACE_TEXT ("CIAO::DDS4CCM::ConditionManager_T::query - ") ACE_TEXT ("Error: No QueryCondition set yet. ") ACE_TEXT ("First set a filter.\n"))); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::CCM_DDS::QueryFilter_var filter; ACE_NEW_THROW_EX (filter, ::CCM_DDS::QueryFilter(), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); filter->expression= this->qc_reader_->get_query_expression (); this->qc_reader_->get_query_parameters (filter->parameters); return filter._retn (); @@ -235,7 +235,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::query ( this->qc_getter_.in (), this->qc_listener_.in ())); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1); } else { @@ -273,7 +273,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_paramete ACE_TEXT ("Error setting expression_parameters. ") ACE_TEXT ("Retval is %C\n"), translate_retcode(retval))); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, retval); } } @@ -287,7 +287,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::attach_query { ACE_NEW_THROW_EX (this->ws_, DDSWaitSet (), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDS_ReturnCode_t const retcode = this->ws_->attach_condition (this->get_querycondition_getter ()); @@ -296,7 +296,7 @@ CIAO::DDS4CCM::ConditionManager_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::attach_query { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::ConditionManager_T::attach_querycondition - " "Unable to attach query condition to waitset.\n")); - throw CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 1); } DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CIAO::DDS4CCM::Getter_Base_T::attach_querycondition - " "Query condition created and attached to Waitset.\n")); diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp index 91f203f3416..bb969419e00 100644 --- a/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp +++ b/CIAO/connectors/dds4ccm/impl/ContentFilterSetting.cpp @@ -59,7 +59,7 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " "Unable to get DomainParticipant.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } ACE_Auto_Array_Ptr <char> name; @@ -67,7 +67,7 @@ namespace CIAO char *name_bootstrap = 0; ACE_NEW_THROW_EX (name_bootstrap, char[32], - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); name.reset(name_bootstrap); } ACE_OS::sprintf (name.get (), @@ -82,7 +82,7 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " "Error creating ContentfilteredTopic.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_ContentFilterSetting_i::create_contentfilteredtopic: " "successfully created ContentFilteredTopic <%C>\n", @@ -114,7 +114,7 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: " "Calling set_filter_parameters without having set a filter\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } ::DDS::ReturnCode_t retcode = this->cft_->set_expression_parameters (parameters); @@ -129,7 +129,7 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_ContentFilterSetting_i::set_filter_parameters: " "Error setting filter parameters: <%C>\n", translate_retcode (retcode))); - throw CCM_DDS::InternalError (retcode, 0); + throw ::CCM_DDS::InternalError (retcode, 0); } } } diff --git a/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp index 5f77938a28d..5c0a143c980 100644 --- a/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ContentFilteredTopic_T.cpp @@ -66,7 +66,7 @@ namespace CIAO DDSTopic *topic = this->impl ()->get_related_topic (); ACE_NEW_THROW_EX (retval, Topic_type (topic), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -92,7 +92,7 @@ namespace CIAO DDSDomainParticipant * p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp index 0c29ce53336..2e44ec4b8a4 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp @@ -176,7 +176,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::ccm_activate (void) DomainParticipantListener( this->context_-> get_connection_error_listener ()), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->domain_participant_->set_listener ( this->domainparticipantlistener_.in (), @@ -213,7 +213,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::ccm_remove (void) this->domain_participant_.in ()); if (retcode != ::DDS::RETCODE_OK) { - throw CCM_DDS::InternalError (retcode, 0); + throw ::CCM_DDS::InternalError (retcode, 0); } this->domain_participant_ = ::DDS::DomainParticipant::_nil (); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp index e8f3eb5a705..fd4875beb97 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp @@ -253,10 +253,10 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_Event_Connector_T::configuration_complete"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -269,7 +269,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_Event_Connector_T::configuration_complete - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -314,10 +314,10 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_Event_Connector_T::ccm_activate"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -330,7 +330,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_Event_Connector_T::ccm_activate - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -365,10 +365,10 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_Event_Connector_T::ccm_passivate"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -381,7 +381,7 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_Event_Connector_T::ccm_passivate - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -416,10 +416,10 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void) "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_Event_Connector_T::ccm_remove"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -432,6 +432,6 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void) DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_Event_Connector_T::ccm_remove - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp index 4c94b92bf70..02e4c1842e2 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp @@ -70,7 +70,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( this->data_control_.in (), reactor, &this->condition_manager_), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } this->data_reader_.set_listener ( this->listener_.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp index d999664e27c..bccc99c2a90 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp @@ -74,7 +74,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( this->data_control_.in (), reactor, &this->condition_manager_), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->data_reader_.set_listener ( this->listener_.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp index 710bbf8e36c..05e751b4301 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp @@ -365,10 +365,10 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_State_Connector_T::configuration_complete"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -381,7 +381,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_com DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_State_Connector_T::configuration_complete - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -443,10 +443,10 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_State_Connector_T::ccm_activate"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -459,7 +459,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_activate (voi DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_State_Connector_T::ccm_activate - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -505,10 +505,10 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_State_Connector_T::ccm_passivate"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -521,7 +521,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_passivate (vo DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_State_Connector_T::ccm_passivate - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } @@ -566,10 +566,10 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void) "Caught CCM_DDS internal exception: error <%C> - " "index <%d>\n", ::CIAO::DDS4CCM::translate_retcode (ex.error_code), - index)); - throw CORBA::INTERNAL (); + ex.index)); + throw ::CORBA::INTERNAL (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("DDS_State_Connector_T::ccm_remove"); DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO @@ -582,7 +582,7 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::ccm_remove (void) DDS4CCM_ERROR (1, (LM_EMERGENCY, CLINFO "DDS_State_Connector_T::ccm_remove - " "Caught unexpected exception.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index 7ff365d5073..b701d2f998a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -73,7 +73,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate ( { ACE_NEW_THROW_EX (this->listener_, PortStatusListener_type (status, reactor), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } this->data_reader_.set_listener ( this->listener_.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp index 7289cb4059e..654fc52405d 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp @@ -125,7 +125,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::key_fields (void) ::DDS::StringSeq_var retval = 0; ACE_NEW_THROW_EX (retval, ::DDS::StringSeq (this->key_fields_.length ()), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); retval->length (this->key_fields_.length ()); for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i) @@ -176,7 +176,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::init_default_topic ( } else { - throw CCM_DDS::InternalError (retcode, 0); + throw ::CCM_DDS::InternalError (retcode, 0); } } } @@ -251,7 +251,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_default_top TopicListener ( this->context_->get_connection_error_listener (), reactor), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->topic_->set_listener ( @@ -279,7 +279,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_subscriber SubscriberListener ( this->context_->get_connection_error_listener (), reactor), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->subscriber_->set_listener ( this->subscriber_listener_.in (), @@ -307,7 +307,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate_publisher ( PublisherListener ( this->context_->get_connection_error_listener (), reactor), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->publisher_->set_listener ( this->publisher_listener_.in (), @@ -369,7 +369,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::remove_default_topic this->domain_participant_->delete_topic (this->topic_.in ()); if (retcode != ::DDS::RETCODE_OK) { - throw CCM_DDS::InternalError (retcode, 0); + throw ::CCM_DDS::InternalError (retcode, 0); } this->topic_ = ::DDS::Topic::_nil (); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index 59da5a98e07..3993e2d33a6 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -68,7 +68,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate () { ACE_NEW_THROW_EX (this->data_listener_, DataWriterListener (), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } this->ccm_dds_writer_.set_listener ( this->data_listener_.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index b10dedd2982..f5d26a667c8 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -68,7 +68,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate () { ACE_NEW_THROW_EX (this->data_listener_, DataWriterListener (), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ::DDS::ReturnCode_t const retcode = this->ccm_dds_writer_.set_listener ( this->data_listener_.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp index 70a294bf190..8d41db981f8 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReader_T.cpp @@ -337,7 +337,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_datareader ACE_TEXT ("DataReader_T::delete_datareader - ") ACE_TEXT ("Unable to delete DataReader: <%C>\n"), translate_retcode (retval))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } this->impl_ = 0; } @@ -375,7 +375,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_statusconditio { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -420,7 +420,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_readconditi { ACE_NEW_THROW_EX (retval, ReadCondition_type (rc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -450,7 +450,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_querycondit { ACE_NEW_THROW_EX (retval, QueryCondition_type (qc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -554,7 +554,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_listener ( DataReaderListener_type ( a_listener, this), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } this->lst_mask_ = mask; return this->impl ()->set_listener (ccm_dds_drl, mask); @@ -592,7 +592,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_topicdescripti { ACE_NEW_THROW_EX (dds_td, Topic_type (tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } else { @@ -602,7 +602,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_topicdescripti { ACE_NEW_THROW_EX (dds_td, ContentFilteredTopic_type (cft), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } } return dds_td._retn (); @@ -618,7 +618,7 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_subscriber (vo ::DDSSubscriber* subscriber = this->impl ()->get_subscriber (); ACE_NEW_THROW_EX (dds_td, Subscriber_type (subscriber), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return dds_td._retn (); } @@ -783,6 +783,6 @@ CIAO::DDS4CCM::DataReader_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::set_impl ( { DDS4CCM_ERROR (1, (LM_ERROR, "CIAO::DDS4CCM::DataReader_T::create_datareader - " "Failed to cast DDS::DataReader to DataReader_T\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } } diff --git a/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp index 63dfa9efe12..35ea036ff54 100644 --- a/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataWriter_T.cpp @@ -62,7 +62,7 @@ namespace CIAO ACE_NEW_THROW_EX (ccm_dds_impl_list, DataWriterListener_type (a_listener, this), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return this->impl ()->set_listener (ccm_dds_impl_list, mask); } @@ -91,7 +91,7 @@ namespace CIAO DDSTopic* t = this->impl ()->get_topic (); ACE_NEW_THROW_EX (retval, Topic_type (t), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -103,7 +103,7 @@ namespace CIAO DDSPublisher* p = this->impl ()->get_publisher (); ACE_NEW_THROW_EX (retval, Publisher_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -216,7 +216,7 @@ namespace CIAO DDSStatusCondition* sc = this->impl ()->get_statuscondition (); ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp index 6b35f329a45..e14430240b7 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantFactory_T.cpp @@ -59,7 +59,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_dpl, CCM_DDS_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ACE_CString qos_profile = "default"; @@ -81,13 +81,13 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_participant - " "Error: Unable to create DomainParticipant for domain <%d>\n", domain_id)); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dds_dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); dds_dp->enable (); DomainParticipant_type *typed_dp = @@ -110,7 +110,7 @@ namespace CIAO ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dds_dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } #else @@ -144,7 +144,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_dpl, CCM_DDS_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } ACE_CString qos_profile = library_name; @@ -173,12 +173,12 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_participant_with_profile - " "Error: Unable to create DomainParticipant\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dds_dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); dds_dp->enable (); @@ -200,7 +200,7 @@ namespace CIAO ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dds_dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } } @@ -264,13 +264,13 @@ namespace CIAO ->lookup_participant (domain_id); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); #else ::DDS::DomainParticipant_var dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id); ACE_NEW_THROW_EX (retval, DomainParticipant_type (dp.in ()), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); #endif return retval._retn (); } @@ -370,7 +370,7 @@ namespace CIAO ACE_NEW_THROW_EX (retval, CCM_DDS_DomainParticipantFactory_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>, - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp index d83707fd444..70a19421ed3 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.cpp @@ -191,7 +191,7 @@ namespace CIAO DDSParticipantTopic * dpt = 0; ACE_NEW_THROW_EX (dpt, DDSParticipantTopic (dp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); this->dps_[qos_profile] = dpt; DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DomainParticipantManager::add_participant - " "Added participant with profile <%C>.\n", diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp index da9822a2033..b4d2f39fa7a 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipant_T.cpp @@ -65,7 +65,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_pl, PublisherListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSPublisher * ccm_dds_pub = this->impl ()->create_publisher_with_profile (library_name, @@ -78,13 +78,13 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_publisher_with_profile - " "Error: Unable to create Publisher\n")); delete ccm_dds_pl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); ACE_NEW_THROW_EX (retval, Publisher_type (ccm_dds_pub), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_publisher_with_profile - " @@ -114,7 +114,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_pl, PublisherListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSPublisher * ccm_dds_pub = @@ -127,13 +127,13 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_publisher - " "Error: Unable to create Publisher\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Publisher_var retval = ::DDS::Publisher::_nil (); ACE_NEW_THROW_EX (retval, Publisher_type (ccm_dds_pub), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_publisher - " @@ -202,7 +202,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_sl, SubscriberListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSSubscriber * ccm_dds_sub = this->impl ()->create_subscriber_with_profile ( @@ -217,13 +217,13 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_subscriber_with_profile - " "Error: Unable to create Subscriber\n")); delete ccm_dds_sl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); ACE_NEW_THROW_EX (retval, Subscriber_type (ccm_dds_sub), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_subscriber_with_profile - " @@ -252,7 +252,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_sl, SubscriberListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT; @@ -266,13 +266,13 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_subscriber - " "Error: Unable to create Subscriber\n")); delete ccm_dds_sl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil (); ACE_NEW_THROW_EX (retval, Subscriber_type (ccm_dds_sub), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_subscriber - " "Successfully created a DDSSubscriber\n")); @@ -324,7 +324,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, Subscriber_type (sub), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -345,7 +345,7 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } @@ -353,7 +353,7 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } @@ -366,7 +366,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_tl, TopicListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT; @@ -388,13 +388,13 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - " "Error: RTI DDS returned a nil topic\n")); delete ccm_dds_tl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, Topic_type (dds_tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - " "Successfully created topic with name %C and type %C\n", @@ -419,7 +419,7 @@ namespace CIAO ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, Topic_type (dds_tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -442,14 +442,14 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " "Error: provided nil topic name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } if (type_name == 0) { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " "Error: provided nil type name\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - " @@ -461,7 +461,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_tl, TopicListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSTopicDescription * dds_td = @@ -484,13 +484,13 @@ namespace CIAO "create_topic_with_profile - " "Error: RTI DDS returned a nil topic\n")); delete ccm_dds_tl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, Topic_type (dds_tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::" "create_topic_with_profile - " @@ -516,7 +516,7 @@ namespace CIAO ::DDS::Topic_var retval = ::DDS::Topic::_nil (); ACE_NEW_THROW_EX (retval, Topic_type (dds_tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } } @@ -603,7 +603,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, Topic_type (tp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } else { @@ -613,7 +613,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, ContentFilteredTopic_type (cftp), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } } } @@ -635,13 +635,13 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_contentfilteredtopic - " "Unable to cast provided topic.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } const char** parameterlist = 0; ACE_NEW_THROW_EX (parameterlist, const char*[expression_parameters.length ()], - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i) { @@ -662,13 +662,13 @@ namespace CIAO "RTI DDS returned a nil ContentFilteredTopic for name <%C> and filter " "expression <%C>.\n", name, filter_expression)); - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil (); ACE_NEW_THROW_EX (retval, ContentFilteredTopic_type (ccm_dds_cft), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - " "Successfully created contentfilteredtopic with name <%C> and " @@ -716,7 +716,7 @@ namespace CIAO ACE_UNUSED_ARG (subscription_expression); ACE_UNUSED_ARG (expression_parameters); //Not implemented in version ndds.4.5b.rev01 of RTI DDS. - throw CORBA::NO_IMPLEMENT (); + throw ::CORBA::NO_IMPLEMENT (); #else return this->impl ()->create_multitopic (name, type_name, @@ -733,7 +733,7 @@ namespace CIAO #if (CIAO_DDS4CCM_NDDS==1) ACE_UNUSED_ARG (a_multitopic); //Not implemented in version ndds.4.5b.rev01 of RTI DDS. - throw CORBA::NO_IMPLEMENT (); + throw ::CORBA::NO_IMPLEMENT (); #else return this->impl ()->delete_multitopic (a_multitopic); #endif @@ -783,7 +783,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_impl_list, CCM_DDS_DomainParticipantListener_i (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return this->impl_->set_listener (ccm_dds_impl_list, mask); } @@ -1017,7 +1017,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index e5f0444e55b..19a0199822d 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -158,7 +158,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_Base_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_many "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); } - throw CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 1); } DDS_ReturnCode_t const retval = @@ -278,7 +278,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, true, VENDOR_TYPE>::get_one translate_retcode (retval))); } - throw CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 1); } else if (data.length () == 1 && sample_info[0].valid_data) { @@ -320,7 +320,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false, VENDOR_TYPE>::get_on an_instance = 0; ACE_NEW_THROW_EX (an_instance, typename DDS_TYPE::value_type, - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); DDSConditionSeq active_conditions; if (!this->condition_manager_->wait (active_conditions, this->time_out_)) { @@ -365,7 +365,7 @@ CIAO::DDS4CCM::DDS_CCM::Getter_T<DDS_TYPE, CCM_TYPE, false, VENDOR_TYPE>::get_on "Error returning loan to DDS - <%C>\n", translate_retcode (retval))); } - throw CCM_DDS::InternalError (retcode, 1); + throw ::CCM_DDS::InternalError (retcode, 1); } else if (data.length () == 1 && sample_info[0].valid_data) { diff --git a/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp index 51d17bb6d56..bef5be1e659 100644 --- a/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Publisher_T.cpp @@ -52,7 +52,7 @@ namespace CIAO { DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter - " "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } DDSDataWriterListener *ccm_dds_drl = 0; @@ -60,7 +60,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_drl, DataWriterListener_type (a_listener, 0), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT; DDSDataWriter *ccm_dds_dw = this->impl ()->create_datawriter ( @@ -75,13 +75,13 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter - " "Error: RTI Topic returned a nil datawriter.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); ACE_NEW_THROW_EX (retval, DataWriter_type (ccm_dds_dw), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); ccm_dds_dw->enable (); return retval._retn (); @@ -105,7 +105,7 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_T" "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter_with_profile - " "Error: Unable to cast provided topic to its servant.\n")); - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } DDSDataWriterListener *ccm_dds_drl = 0; @@ -113,7 +113,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_drl, DataWriterListener_type (a_listener, 0), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSDataWriter *ccm_dds_dw = this->impl ()->create_datawriter_with_profile ( topic->get_impl (), @@ -128,7 +128,7 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datawriter_with_profile - " "Error: RTI Topic returned a nil datawriter.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else { @@ -142,7 +142,7 @@ namespace CIAO ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil (); ACE_NEW_THROW_EX (retval, DataWriter_type (ccm_dds_dw), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); ccm_dds_dw->enable (); return retval._retn (); @@ -196,7 +196,7 @@ namespace CIAO DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name); ACE_NEW_THROW_EX (retval, DataWriter_type (dw), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -242,7 +242,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_impl_list, PublisherListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return this->impl ()->set_listener (ccm_dds_impl_list, mask); } @@ -313,7 +313,7 @@ namespace CIAO DDSDomainParticipant* p = this->impl ()->get_participant (); ACE_NEW_THROW_EX (retval, DomainParticipant_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -371,7 +371,7 @@ namespace CIAO DDSStatusCondition* sc = this->impl ()->get_statuscondition (); ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp index d1e76d6e5fc..495476c1ffd 100644 --- a/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/QueryCondition_T.cpp @@ -70,7 +70,7 @@ CIAO::DDS4CCM::CCM_DDS_QueryCondition_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_da { ACE_NEW_THROW_EX (dds_reader, DataReader_type (reader), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return dds_reader._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp index 706cfa76d3f..e7e8711590e 100644 --- a/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ReadCondition_T.cpp @@ -64,7 +64,7 @@ CIAO::DDS4CCM::CCM_DDS_ReadCondition_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_dat { ACE_NEW_THROW_EX (retval, DataReader_type (rd), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp index 61dc222ddc1..3dcf2c7fc4e 100644 --- a/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp +++ b/CIAO/connectors/dds4ccm/impl/StatusCondition.cpp @@ -43,7 +43,7 @@ namespace CIAO ::DDS::Entity_ptr CCM_DDS_StatusCondition_i::get_entity (void) { - throw CORBA::NO_IMPLEMENT (); + throw ::CORBA::NO_IMPLEMENT (); } DDSStatusCondition * diff --git a/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp index 567d22a5799..9cec96adfe0 100644 --- a/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Subscriber_T.cpp @@ -52,7 +52,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -157,7 +157,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_drl, DataReaderListener_type (a_listener, 0), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSDataReader * ccm_dds_dr = 0; @@ -173,7 +173,7 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datareader - " "Error: Unable to cast provided topic to one of its servant.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } else ccm_dds_dr = this->create_datareader (cf_topic->get_impl (), @@ -193,7 +193,7 @@ namespace CIAO "<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datareader - " "Error: RTI Topic returned a nil datareader.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else { @@ -205,7 +205,7 @@ namespace CIAO ccm_dds_dr->enable (); ACE_NEW_THROW_EX (retval, DataReader_type (ccm_dds_dr), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -224,7 +224,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_drl, DataReaderListener_type (a_listener, 0), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } DDSDataReader * ccm_dds_dr = 0; @@ -239,7 +239,7 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datareader_with_profile - " "Error: Unable to cast provided topic to one of its servant.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0); } else { @@ -264,7 +264,7 @@ namespace CIAO DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_datareader_with_profile - " "Error: RTI Topic returned a nil datareader.\n")); delete ccm_dds_drl; - throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); } else { @@ -277,7 +277,7 @@ namespace CIAO ::DDS::DataReader_var retval = ::DDS::DataReader::_nil (); ACE_NEW_THROW_EX (retval, DataReader_type (ccm_dds_dr), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); ccm_dds_dr->enable (); @@ -338,7 +338,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, DataReader_type (dr), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } @@ -367,7 +367,7 @@ namespace CIAO ::DDS::DataReader_var rdr; ACE_NEW_THROW_EX (rdr, DataReader_type (dds_readers[i]), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); readers [i] = rdr._retn (); } } @@ -417,7 +417,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_impl_list, SubscriberListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return this->impl ()->set_listener (ccm_dds_impl_list, mask); } @@ -464,7 +464,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, DomainParticipant_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp index c4366841f80..32e07cba36b 100644 --- a/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/TopicDescription_T.cpp @@ -45,7 +45,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, DomainParticipant_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/Topic_T.cpp b/CIAO/connectors/dds4ccm/impl/Topic_T.cpp index 14d969447bb..1c7e2566026 100644 --- a/CIAO/connectors/dds4ccm/impl/Topic_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Topic_T.cpp @@ -59,7 +59,7 @@ namespace CIAO { ACE_NEW_THROW_EX (ccm_dds_impl_list, TopicListener_type (a_listener), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return this->impl ()->set_listener (ccm_dds_impl_list, mask); } @@ -109,7 +109,7 @@ namespace CIAO DDSStatusCondition* sc = this->impl ()->get_statuscondition (); ACE_NEW_THROW_EX (retval, CCM_DDS_StatusCondition_i (sc), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); return retval._retn (); } @@ -155,7 +155,7 @@ namespace CIAO { ACE_NEW_THROW_EX (retval, DomainParticipant_type (p), - CORBA::NO_MEMORY ()); + ::CORBA::NO_MEMORY ()); } return retval._retn (); } diff --git a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp index 89f372d8b75..546fda6e2d9 100644 --- a/CIAO/connectors/dds4ccm/impl/Updater_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Updater_T.cpp @@ -57,7 +57,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_i ( DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") ACE_TEXT ("Unable to unregister instance, nil handle.\n"))); - throw CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index); + throw ::CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index); } ::DDS_ReturnCode_t const result = this->impl ()->write (an_instance, hnd); if (result != DDS_RETCODE_OK) @@ -66,7 +66,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::create_i ( ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ") ACE_TEXT ("Unable to update data, error %C.\n"), translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); + throw ::CCM_DDS::InternalError (result, index); } } @@ -102,7 +102,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::update_i ( ACE_TEXT ("CIAO::DDS4CCM::Updater_T::update_i: ") ACE_TEXT ("Unable to update data, error %C.\n"), translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); + throw ::CCM_DDS::InternalError (result, index); } } @@ -128,7 +128,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::update_one ( if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) { - throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); } } if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) @@ -155,7 +155,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_i ( ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") ACE_TEXT ("Unable to dispose instance, error %C.\n"), translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); + throw ::CCM_DDS::InternalError (result, index); } result = this->impl ()->unregister_instance (an_instance, hnd); if (result != DDS_RETCODE_OK) @@ -164,7 +164,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_i ( ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ") ACE_TEXT ("Unable to unregister instance, error %C.\n"), translate_retcode (result))); - throw CCM_DDS::InternalError (result, index); + throw ::CCM_DDS::InternalError (result, index); } } @@ -190,7 +190,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::delete_one ( if (!DDS_InstanceHandle_equals (&hnd, &instance_handle)) { - throw CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); + throw ::CCM_DDS::InternalError (::DDS_RETCODE_BAD_PARAMETER, 0); } } if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL)) diff --git a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp index 21a9b6571c1..b76a38c1c82 100644 --- a/CIAO/connectors/dds4ccm/impl/Writer_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Writer_T.cpp @@ -39,7 +39,7 @@ CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::write_i ( DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::Writer_T::write_i - " "Write unsuccessful, received error code %C\n", translate_retcode (retval))); - throw CCM_DDS::InternalError (retval, index); + throw ::CCM_DDS::InternalError (retval, index); } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp index a58a38193c6..2c3d3079394 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp @@ -103,7 +103,7 @@ write_back (LatencyTest & an_instance) { test_data_writer_->write(an_instance, ::DDS::HANDLE_NIL); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp index eead5a75c95..a78c4cbe77c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -333,7 +333,7 @@ write_one (void) ACE_High_Res_Timer::gettimeofday_hr ().to_usec (start_time_); test_data_writer_->write (*instance_, DDS_HANDLE_NIL); } - catch (const CORBA::Exception& ) + catch (const ::CORBA::Exception& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") ACE_TEXT ("while writing sample with sequence_number <%u>.\n"), diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp index 8b1eac4715f..a46b0a36c92 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp @@ -101,7 +101,7 @@ CORBA::UShort domain_id = 0; { cmd_data_writer->write(*instance_cmd,::DDS::HANDLE_NIL); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") @@ -121,7 +121,7 @@ CORBA::UShort domain_id = 0; test_data_writer->write(*instance,::DDS::HANDLE_NIL); ++number_of_msg; } - catch (const CORBA::Exception&) + catch (const ::CORBA::Exception&) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ") 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 b878849b064..a9ef2ae1544 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 @@ -507,7 +507,7 @@ Sender_exec_i::record_time (unsigned long long nanotime) this->context_->get_connection_ping_listen_data_control (); dlc->mode (::CCM_DDS::ONE_BY_ONE); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp index 123fd252936..75ffedd2026 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.cpp @@ -382,7 +382,7 @@ namespace CIAO_Throughput_Sender_Impl throw ::CORBA::INTERNAL (); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 436e78204e1..2fc95a1dff7 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 @@ -153,7 +153,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); } 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 fdb94091304..1d67de4795d 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 @@ -272,7 +272,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (this->raw_listen_ ? ::CCM_DDS::ONE_BY_ONE : ::CCM_DDS::NOT_ENABLED); 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 256cec568cd..90b02821c20 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 @@ -262,7 +262,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ALL: "); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp index 1fd6df25580..0cc03a5c873 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.cpp @@ -173,7 +173,7 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ALL: "); ACE_ERROR ((LM_ERROR, 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 cf2e820e3ea..b27529db710 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 @@ -156,7 +156,7 @@ namespace CIAO_CoherentUpdate_Test_Sender_Impl CORBA::INTERNAL ()); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (this->wh_); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp index 0138aa5483a..97819c28dcd 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.cpp @@ -173,7 +173,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ALL: "); ACE_ERROR ((LM_ERROR, 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 b45d1428cee..a833b1d6d26 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 @@ -150,7 +150,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl ::CORBA::INTERNAL ()); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (this->wh_); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp index 5bc785546d1..84d9ed2b601 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender_exec.cpp @@ -165,7 +165,7 @@ namespace CIAO_CFTLE_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp index d3d52a08c50..7328f8f281d 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component_exec.cpp @@ -60,7 +60,7 @@ namespace CIAO_CFT_Exception_Test_CFTTestComponent_Impl "caught expected InternalErr exception.\n")); exception_caught = true; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index 7b41f7468a1..f0a50d5cc44 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -333,7 +333,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl test, ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception (test); ACE_ERROR ((LM_ERROR, @@ -398,7 +398,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <GETTER> - ") @@ -511,7 +511,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <READER> - ") @@ -617,7 +617,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::test_set_query_parameters - ") diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp index 12d9af871ef..ff6b300d38d 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp @@ -160,7 +160,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl CORBA::INTERNAL ()); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (this->wh_); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp index c6fc4a1ef06..994b03dca7d 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp @@ -166,7 +166,7 @@ namespace CIAO_CFTLS_Test_Sender_Impl this->updater_ = this->context_->get_connection_info_update_data (); start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 699fc6a3478..3b894489f5f 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver_exec.cpp @@ -95,7 +95,7 @@ namespace CIAO_Writer_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); } diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp index 255bad469aa..dd57bf23152 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp @@ -220,7 +220,7 @@ namespace CIAO_Writer_Sender_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " "Datawriter connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -234,14 +234,14 @@ namespace CIAO_Writer_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " "Error casting the typed CCM DataWriter to a typed " "DDS DataWriter.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } else { ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " "Error casting DataWriter to typed DataWriter\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp index f98efa528a6..35c994fda77 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component_exec.cpp @@ -103,7 +103,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("writer_data is NIL.\n")))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_writer: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_writer - ") @@ -148,7 +148,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("getter_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") @@ -189,7 +189,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("getter_fresh_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") @@ -234,7 +234,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("listen_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") @@ -274,7 +274,7 @@ namespace CIAO_GCE_Test_GetComponentEventTestComponent_Impl ACE_TEXT ("listen_data_control is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp index 639458ec58e..ad376106d6d 100644 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component_exec.cpp @@ -114,7 +114,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("updater_data is NIL.\n")))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_updater: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") @@ -159,7 +159,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("reader_data is NIL.\n")))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_reader: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_reader - ") @@ -204,7 +204,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("getter_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") @@ -245,7 +245,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("getter_fresh_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_getter: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_getter - ") @@ -290,7 +290,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("listen_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") @@ -330,7 +330,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("listen_data_control is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_listener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") @@ -375,7 +375,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("statelisten_data is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") @@ -415,7 +415,7 @@ namespace CIAO_GCS_Test_GetComponentStateTestComponent_Impl ACE_TEXT ("statelisten_data_control is NIL.\n"))); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Component_exec_i::test_statelistener: "); ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Component_exec_i::test_listener - ") diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp index 2d2b448846b..8ee378f5011 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp @@ -389,7 +389,7 @@ namespace CIAO_Getter_Test_Receiver_Impl "Caught unexcepted InternalError " "exception\n")); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR FIXED: TIMEOUT GET ONE:"); ACE_ERROR ((LM_ERROR, @@ -434,7 +434,7 @@ namespace CIAO_Getter_Test_Receiver_Impl "Caught unexcepted InternalError " "exception\n")); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR VARIABLE: TIMEOUT GET ONE:"); ACE_ERROR ((LM_ERROR, @@ -486,7 +486,7 @@ namespace CIAO_Getter_Test_Receiver_Impl "Caught unexcepted InternalError " "exception\n")); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: TIMEOUT GET MANY:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp index 32822155cce..14af46203af 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp @@ -255,7 +255,7 @@ namespace CIAO_Getter_Test_Sender_Impl { this->ccm_activated_ = true; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 f570aaa60f9..89506ded4fd 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp @@ -240,14 +240,14 @@ namespace CIAO_Writer_Sender_Impl ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " "Error casting the typed CCM DataWriter to a typed " "DDS DataWriter.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } else { ACE_ERROR ((LM_ERROR, "ERROR : Sender_exec_i::configuration_complete - " "Error casting DataWriter_var to typed DataWriter\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } 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 699fc6a3478..3b894489f5f 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -95,7 +95,7 @@ namespace CIAO_Writer_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp index 21034f31357..29b362461e3 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender_exec.cpp @@ -179,7 +179,7 @@ namespace CIAO_LMBM_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp index f2bf04d1231..6d7392a7da1 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp @@ -130,7 +130,7 @@ namespace CIAO_LNE_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp index a0259ac91b2..cea241a46f9 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender_exec.cpp @@ -163,7 +163,7 @@ namespace CIAO_LOBO_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 a62af15379a..c380a04b4c7 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 @@ -226,7 +226,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::NOT_ENABLED); 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 7dc4db0abee..eae94d4f84f 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 @@ -248,7 +248,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::NOT_ENABLED); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp index 904f6503120..51410d26d78 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.cpp @@ -213,7 +213,7 @@ namespace CIAO_Different_Test_Receiver_Impl test, ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception (test); ACE_ERROR ((LM_ERROR, @@ -264,7 +264,7 @@ namespace CIAO_Different_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp index 61910f119b2..adb0d985729 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender_exec.cpp @@ -99,7 +99,7 @@ namespace CIAO_Different_Test_Sender_Impl WriteHandler *wh = new WriteHandler (*this); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp index 3ae0a0dd63f..e56fdd19722 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender_exec.cpp @@ -164,7 +164,7 @@ namespace CIAO_QCLE_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index 71a40c64871..a83ac97abd6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -294,7 +294,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl test, ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception (test); ACE_ERROR ((LM_ERROR, @@ -320,7 +320,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::test_exception: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_exception - " @@ -348,7 +348,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " @@ -435,7 +435,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl ex.error_code)); return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::test_set_query_parameters: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::test_set_query_parameters - " diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp index e9ae9e4a114..63a763b9d94 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.cpp @@ -152,7 +152,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl WriteHandler *wh = new WriteHandler (*this); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp index 7f54311f426..4007e8c4ae6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender_exec.cpp @@ -164,7 +164,7 @@ namespace CIAO_QCLS_Test_Sender_Impl this->updater_ = this->context_->get_connection_info_update_data (); start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp index 11fdcc09615..56f3238c5ff 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender_exec.cpp @@ -164,7 +164,7 @@ namespace CIAO_QCTL_Test_Sender_Impl { start (); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp index e404d84d17c..1f46dbad052 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.cpp @@ -202,7 +202,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl test, ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception (test); ACE_ERROR ((LM_ERROR, @@ -237,7 +237,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl } return; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: Receiver_exec_i::check_filter: "); ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp index b0c0faa9241..36d653c22a6 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.cpp @@ -145,7 +145,7 @@ namespace CIAO_QCTQ_Test_Sender_Impl WriteHandler *wh = new WriteHandler (*this); this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (wh); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 10f17efe9d9..855c0d301a0 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 @@ -166,7 +166,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ONE LAST:"); ACE_ERROR ((LM_ERROR, @@ -246,7 +246,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ex.error_code)); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ONE ALL: "); ACE_ERROR ((LM_ERROR, @@ -297,7 +297,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ LAST: "); ACE_ERROR ((LM_ERROR, @@ -392,7 +392,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ ALL: "); ACE_ERROR ((LM_ERROR, @@ -502,7 +502,7 @@ namespace CIAO_Reader_Test_Receiver_Impl ACE_TEXT ("caught InternalError exception: retval <%u>\n"), ex.error_code)); } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("ERROR: READ NO DATA: "); ACE_ERROR ((LM_ERROR, 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 8fe3402551c..e37c13bdf2a 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 @@ -167,7 +167,7 @@ namespace CIAO_Reader_Test_Sender_Impl { this->ccm_activated_ = true; } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); ACE_ERROR ((LM_ERROR, 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 522bfbb65c2..495993ea9dc 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 @@ -176,7 +176,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::NOT_ENABLED); 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 88b01ef56b5..fcad905d5b2 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 @@ -276,7 +276,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::MANY_BY_MANY); 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 2021ed3f03d..95b1e7fcb91 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 @@ -166,7 +166,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp index 76271d60546..1916c2f8911 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp @@ -54,7 +54,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 1 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (dw1.in ()); @@ -68,7 +68,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 1 to typed DataWriter 1\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) @@ -85,7 +85,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 2 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -100,7 +100,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 2 to typed DataWriter 2\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) @@ -117,7 +117,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 3 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -132,7 +132,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 3 to typed DataWriter 3\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp index ed1358daaee..59edb2bb26e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp @@ -74,7 +74,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 1 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; DataWriter_type * typed_ccm_dw = dynamic_cast <DataWriter_type *> (dw1.in ()); @@ -92,7 +92,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 1 to typed DataWriter 1\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) @@ -109,7 +109,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 2 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -128,7 +128,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 2 to typed DataWriter 2\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) @@ -145,7 +145,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 3 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -164,7 +164,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 3 to typed DataWriter 3\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) @@ -180,7 +180,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Datawriter 4 connection is NIL.\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } typedef ::CIAO::DDS4CCM::CCM_DDS_DataWriter_Base DataWriter_type; @@ -199,7 +199,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl { ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " "Error casting DataWriter 4 to typed DataWriter 4\n")); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } } catch (...) diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp index 8eaf1e069ad..1178e35bddb 100644 --- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp +++ b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int , ACE_TCHAR **) "regarding nano seconds succeeded\n")); } } - catch (const CORBA::Exception& ex) + catch (const ::CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught:"); return 1; 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 c731c75d173..152ec750492 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 @@ -191,7 +191,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); 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 6573e8ad5fc..ed72d695c25 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp @@ -126,7 +126,7 @@ namespace CIAO_Writer_Receiver_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::NOT_ENABLED); } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp index b1bd82470b2..0a8ae0aecf2 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp @@ -109,7 +109,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl if (::CORBA::is_nil (lc.in ())) { ACE_ERROR ((LM_INFO, ACE_TEXT ("Error: Listener control receptacle is null!\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } lc->mode (::CCM_DDS::ONE_BY_ONE); diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp index 0191c9696af..eac7de39794 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp @@ -135,7 +135,7 @@ namespace CIAO_Shapes_Sender_comp_Impl { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } try @@ -169,7 +169,7 @@ namespace CIAO_Shapes_Sender_comp_Impl { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::update_square - ") ACE_TEXT ("Unable to write: write_data is nil.\n"))); - throw CORBA::INTERNAL (); + throw ::CORBA::INTERNAL (); } try |