diff options
Diffstat (limited to 'TAO/tao/ClientRequestInfo_i.cpp')
| -rw-r--r-- | TAO/tao/ClientRequestInfo_i.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp index de3a8b3c417..26e31fbe365 100644 --- a/TAO/tao/ClientRequestInfo_i.cpp +++ b/TAO/tao/ClientRequestInfo_i.cpp @@ -165,7 +165,7 @@ TAO_ClientRequestInfo_i::received_exception (ACE_ENV_SINGLE_ARG_DECL) if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION && this->reply_status_ != PortableInterceptor::USER_EXCEPTION) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -200,7 +200,7 @@ TAO_ClientRequestInfo_i::received_exception_id ( if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION && this->reply_status_ != PortableInterceptor::USER_EXCEPTION) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -248,7 +248,7 @@ TAO_ClientRequestInfo_i::get_effective_component ( // No tagged component was found that matched the given // IOP::ComponentId. - ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 28, + ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0); } @@ -300,7 +300,7 @@ TAO_ClientRequestInfo_i::get_effective_components ( // No tagged component sequence was allocated, meaning no tagged // components were found that matched the given // IOP::ComponentId. - ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 28, + ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0); } @@ -343,7 +343,7 @@ TAO_ClientRequestInfo_i::add_request_service_context ( if (service_context_list.set_context (service_context, replace) == 0) { - ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 15, + ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO)); } } @@ -439,7 +439,7 @@ Dynamic::ParameterList * TAO_ClientRequestInfo_i::arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -448,7 +448,7 @@ Dynamic::ExceptionList * TAO_ClientRequestInfo_i::exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -457,7 +457,7 @@ Dynamic::ContextList * TAO_ClientRequestInfo_i::contexts (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -466,7 +466,7 @@ Dynamic::RequestContext * TAO_ClientRequestInfo_i::operation_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -475,7 +475,7 @@ CORBA::Any * TAO_ClientRequestInfo_i::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), 0); } @@ -505,7 +505,7 @@ TAO_ClientRequestInfo_i::sync_scope (ACE_ENV_SINGLE_ARG_DECL) if (inv != 0 && this->response_expected_ == 0) return inv->sync_scope (); - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), -1); } @@ -517,7 +517,7 @@ TAO_ClientRequestInfo_i::reply_status (ACE_ENV_SINGLE_ARG_DECL) { if (this->reply_status_ == -1) // A reply hasn't been received yet. - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), -1); @@ -529,7 +529,7 @@ TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD) - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -597,7 +597,7 @@ TAO_ClientRequestInfo_i::get_service_context_i ( else { // Not found. - ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 26, + ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 26, CORBA::COMPLETED_NO), 0); } |