diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-29 08:01:00 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-29 08:01:00 +0000 |
| commit | 56a06f481f424c35d07b3fd5a11c07166bc5c9a3 (patch) | |
| tree | b96ba153f0f934aa2ae75eebdf9f5c5631073509 | |
| parent | 4fb90adc4d5cec3efb10cd0e375543e85676df45 (diff) | |
| download | ATCD-56a06f481f424c35d07b3fd5a11c07166bc5c9a3.tar.gz | |
Removed argument from system exceptions' instantiations if they match the default arguments.
73 files changed, 473 insertions, 462 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 64ce5107ecb..45ec707fa93 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -154,14 +154,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "CORBA::Boolean _tao_retval = 0;" << be_nl; *os << "CORBA::String_var value;" << be_nl; *os << "if (!((_tao_in >> value.out ())))" << be_idt_nl; - *os << "ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));" << be_uidt_nl << be_nl; + *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl; *os << "_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);" << be_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl; *os << "ACE_CHECK;" << be_nl; *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl; *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl; - *os << "ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));" << be_uidt << be_uidt_nl; + *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl; *os << "}\n\n"; @@ -183,7 +183,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "ACE_CHECK;" << be_nl; *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl; *os << "if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))" << be_idt_nl; - *os << "ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));" << be_uidt << be_uidt_nl; + *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt << be_uidt_nl; *os << "}\n\n"; @@ -251,10 +251,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "if (this->_find (opname, skel, req.operation_length ()) == -1)" << be_nl; *os << "{" << be_idt_nl; *os << "ACE_ERROR ((LM_ERROR, \"Bad operation <%s>\\n\", opname));" << be_nl; - *os << "ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));" + *os << "ACE_THROW (CORBA_BAD_OPERATION ());" //<< "ACE_TRY_ENV);" << be_uidt_nl; << be_uidt_nl; - // *os << "env.exception (new CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));" << be_nl; + // *os << "env.exception (new CORBA_BAD_OPERATION ());" << be_nl; *os << "}" << be_nl; *os << "else" << be_idt_nl; *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index ffdc4a1eb9f..fb0fed7fe57 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -151,7 +151,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) if (node->has_native ()) // native exists => no stub { if (this->gen_raise_exception (bt, "CORBA::MARSHAL", - "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO") == -1) + "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_operation_cs::" @@ -170,7 +170,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) // if the stub object was bad, then we raise a system exception if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF", - "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO") == -1) + "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_operation_cs::" @@ -726,7 +726,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation // if marshaling fails, raise exception if (this->gen_raise_exception (bt, "CORBA::MARSHAL", - "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO") == -1) + "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_compiled_visitor_operation_cs::" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 4ef46c15d74..4e386fe12f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -680,7 +680,7 @@ be_compiled_visitor_operation_ss::gen_demarshal_params (be_operation *node, // if marshaling fails, raise exception if (this->gen_raise_exception (bt, "CORBA::MARSHAL", - "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO", + "", "ACE_TRY_ENV") == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -776,7 +776,7 @@ be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node, *os << be_uidt_nl << "))\n" << be_idt; // if marshaling fails, raise exception if (this->gen_raise_exception (bt, "CORBA::MARSHAL", - "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO", + "", "ACE_TRY_ENV") == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index dfc23ec852c..65aa956d458 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -78,7 +78,7 @@ Notifier_i::register_callback (const char *stock_name, // the unbounded set entry is created. // NOTE:: its pathetic, but to make this macro call its necessary to name // your environment variable ACE_TRY_ENV - ACE_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY ()); ACE_CHECK; // When a new entry is tried to be inserted into the unbounded set and it diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index 96ef2dadadc..cd6f6bd0f7e 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -52,7 +52,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request, else { - ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_IMPLEMENT ()); } ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp index f9fcdac81a6..180cb15f302 100644 --- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp +++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp @@ -78,7 +78,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, } else { - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); } } else // now forward, in throwing the ForwardRequest Exception diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index ba1b46c7140..db831d7a92e 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -66,7 +66,7 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, if (servant != 0) return servant; else - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); } diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index 9b40668bb9f..6c9a7503f7f 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -72,7 +72,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, return servant; } else - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); } diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp index a0fdc22adc8..da07b2643ae 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp @@ -44,7 +44,7 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid, else { ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); - //CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO); + //CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (); //env.exception (exception); //return 0; } diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp index cdae1a9b60c..3ee40ec6b0b 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp @@ -58,7 +58,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); // //CORBA::Exception *exception = - // new CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO); + // new CORBA::OBJECT_NOT_EXIST (); //env.exception (exception); //return 0; } diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp index c2c661c4191..062c54a644f 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp @@ -47,7 +47,7 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, if (servant != 0) return servant; else - TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (), env, 0); } diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp index 902a88093f0..cc854744b08 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp @@ -58,7 +58,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, return servant; } else - TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (), env, 0); } diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index e7bdb111a0e..fae106e9322 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -62,7 +62,7 @@ AccountManager_i::open (const char *name, ACE_NEW_THROW_EX (result, Account_i (name, initial_balance), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (Bank::Account::_nil ()); // Enter the new Account in the hash map. If the <bind> @@ -73,7 +73,7 @@ AccountManager_i::open (const char *name, if (hash_map_.bind (name, result) == -1) { delete result; - TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_RETURN (CORBA::UNKNOWN (), Bank::Account::_nil ()); } } diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index 50dbffd02d7..e73f7525206 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -62,7 +62,7 @@ Echo_i::echo_string (const char *mesg, // raised. if (str.in () == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0); // Got thru! now, make a deep copy of the mesg string and send it // back to the client. diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index ec5c33c2cda..364c63fa682 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -23,7 +23,7 @@ Grid_i::Grid_i (CORBA::Short x, { ACE_NEW_THROW_EX (array_, CORBA::Long *[y], - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // Allocate memory for the matrix. @@ -32,7 +32,7 @@ Grid_i::Grid_i (CORBA::Short x, { ACE_NEW_THROW_EX (array_[ctr], CORBA::Long[x], - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; } @@ -189,7 +189,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, // returns a null value if it fails ACE_NEW_THROW_EX (grid_ptr, Grid_i (width, height, ACE_TRY_ENV), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (Grid::_nil ()); // Register the Grid pointer. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 0dfa84f3dd8..aaa6ddd4387 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -46,7 +46,7 @@ CC_Lock::lock (CORBA::Environment &) lock_held_++; // if (semaphore_.acquire () == -1) - // TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + // TAO_THROW (CORBA::INTERNAL ()); } CORBA::Boolean @@ -74,7 +74,7 @@ CC_Lock::try_lock (CORBA::Environment &TAO_IN_ENV) return 0; } else - TAO_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_RETURN (CORBA::INTERNAL (), 0); } ACE_DEBUG ((LM_DEBUG, @@ -95,7 +95,7 @@ CC_Lock::unlock (CORBA::Environment &TAO_IN_ENV) int success = 0; //semaphore_.release (); if (success == -1) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); lock_held_--; @@ -218,9 +218,9 @@ void CC_LockModeIterator::Next(CORBA::Environment &TAO_IN_ENV) current_ = CosConcurrencyControl::write; break; case CosConcurrencyControl::write: - TAO_THROW(CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::INTERNAL ()); default: - TAO_THROW(CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::INTERNAL ()); } } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index f76298d56ef..1fea8231ad1 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -65,7 +65,7 @@ CC_LockSet::Init (CORBA::Environment &TAO_IN_ENV) // Acquire the semaphore in order to be able to put requests on hold if (semaphore_.acquire () == -1) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); } // Destructor @@ -104,7 +104,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode, // the FIFO properties of ACE_Token! if (this->lock_i (lm) == 1) if (semaphore_.acquire () == -1) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); } // Tries to lock. If it is not possible false is returned. @@ -181,7 +181,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, if (compatible (lock_on_queue) == 1) { if (semaphore_.release () == -1) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); lock_[lock_on_queue]++; } else @@ -221,7 +221,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, TAO_CHECK_ENV; if (semaphore_.acquire () == -1) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); } } TAO_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index fc47fc02ff4..bb3c86dd21d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -35,10 +35,10 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); - TAO_IN_ENV.exception (new CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_IN_ENV.exception (new CORBA::NO_MEMORY ()); ACE_NEW_THROW_EX (ls, CC_LockSet, - CORBA::NO_MEMORY(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); return ls->_this (ACE_TRY_ENV); @@ -54,10 +54,10 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which, // @@ I commented out the following statement becuase it doesn't make any // sense at all. -- Nanbor - // TAO_IN_ENV.exception (new CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + // TAO_IN_ENV.exception (new CORBA::NO_MEMORY ()); ACE_NEW_THROW_EX (ls, CC_LockSet (which), - CORBA::NO_MEMORY(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); return ls->_this (ACE_TRY_ENV); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp index fabba906ba5..c8293655272 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp @@ -157,7 +157,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier ACE_NEW_THROW_EX (this->wrapper_, TAO_CosEC_PushSupplierWrapper (push_supplier), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; this->proxypushconsumer_->connect_push_supplier (this->wrapper_->_this (ACE_TRY_ENV), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp index 19e2de01ce7..75141c5e6eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp @@ -130,11 +130,11 @@ void TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushCon if (push_consumer == CosEventComm::PushConsumer::_nil()) - ACE_THROW (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM ()); ACE_NEW_THROW_EX (this->wrapper_, TAO_CosEC_PushConsumerWrapper (push_consumer), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // @@ This code is not exception safe. diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index d6c740e7517..d63b149b5c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -265,7 +265,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, // Allocate a new dispatch queue. queues_[priority] = new ACE_ES_Dispatch_Queue (this, ¬ification_strategy_); if (queues_[priority] == 0) - TAO_THROW (CORBA::NO_MEMORY (0, TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO, + TAO_THROW (CORBA::NO_MEMORY (0, , "ACE_ES_Priority_Dispatching::connected")); // Initialize the dispatch queue corresponding to the @@ -281,7 +281,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, // spawns the threads. if (queues_[priority]->open_queue (priority, threads_per_queue_) == -1) - TAO_THROW (DISPATCH_ERROR (0, TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO, + TAO_THROW (DISPATCH_ERROR (0, , "ACE_ES_Priority_Dispatching::connected:" "queue open failed.\n")); @@ -382,7 +382,7 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, " dropping event.\n", preemption_priority)); return; #if 0 - TAO_THROW (SYNC_ERROR (0, TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO, "ACE_ES_Priority_Dispatching::push")); + TAO_THROW (SYNC_ERROR (0, , "ACE_ES_Priority_Dispatching::push")); #endif /* 0 */ } @@ -397,9 +397,9 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, " release failed.\n")); if (errno != EPIPE) { - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // @@ Orbix parameters - // 0, TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO, + // 0, , // "ACE_ES_Priority_Dispatching::push enqueue failed")); } else diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp index 4504b3e1978..e244d0d3eb9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -354,14 +354,14 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr, // @@ TODO Use a Event Channel specific exception ACE_DEBUG ((LM_DEBUG, "ECG_UDP (%t) send failed %p\n", "")); - TAO_THROW(CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::COMM_FAILURE ()); } else if (n == 0) { // @@ TODO Use a Event Channel specific exception ACE_DEBUG ((LM_DEBUG, "ECG_UDP (%t) EOF on send \n")); - TAO_THROW(CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::COMM_FAILURE ()); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp index 32716938644..fde549252c3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp @@ -27,7 +27,7 @@ TAO_EC_ProxyPushSupplier_Set::connected_i ( CORBA::Environment &ACE_TRY_ENV) { if (this->all_suppliers_.insert (supplier) != 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY ()); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 75142137f0b..1325a900c63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -70,7 +70,7 @@ TAO_EC_SupplierAdmin::connected (TAO_EC_ProxyPushConsumer *consumer, CORBA::Environment &ACE_TRY_ENV) { if (this->all_consumers_.insert (consumer) != 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY ()); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 9a53b156d4b..a48d66aa66a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -604,12 +604,12 @@ ACE_EventChannel::destroy (CORBA::Environment &) // Flush all messages in the channel. Shutdown_Channel *sc = new Shutdown_Channel (this); if (sc == 0) - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // Create a wrapper around the dispatch request. Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, dispatching_module_); if (act == 0) - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // Set a 100ns timer. if (this->timer_module ()->schedule_timer (0, // no rt-info @@ -1270,13 +1270,13 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, Shutdown_Consumer *sc = new Shutdown_Consumer (this, consumer, scheduler.in ()); if (sc == 0) - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // Create a wrapper around the dispatch request. Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, channel_->dispatching_module_); if (act == 0) - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // ACE_DEBUG ((LM_DEBUG, "EC (%t) initiating consumer disconnect.\n")); @@ -1332,7 +1332,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &TAO_IN_ENV) { ACE_ERROR ((LM_ERROR, "ACE_EventChannel" "::obtain_push_supplier failed.\n")); - TAO_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::NO_MEMORY (), 0); } { @@ -3199,7 +3199,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &TAO_IN_ENV) auto_ptr<ACE_Push_Supplier_Proxy> new_supplier (new ACE_Push_Supplier_Proxy (this)); if (new_supplier.get () == 0) - TAO_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::NO_MEMORY (), 0); { TAO_GUARD_THROW_RETURN (ACE_ES_MUTEX, ace_mon, this->lock_, 0, TAO_IN_ENV, @@ -3223,7 +3223,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, TAO_EC_Event_Set::_create (event_set); if (event == 0) - TAO_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::NO_MEMORY ()); // ACE_DEBUG ((LM_DEBUG, "EC (%t) Supplier_Module::push\n")); for (CORBA::ULong i = 0; i < event->length (); ++i) diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp index 28606ae4e39..ae7ebbc6ffc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp @@ -44,7 +44,7 @@ Logger_Factory_i::make_logger (const char *name, // exception and returns a null value if it fails ACE_NEW_THROW_EX (result, Logger_i (name), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (Logger::_nil ()); } @@ -55,7 +55,7 @@ Logger_Factory_i::make_logger (const char *name, if (hash_map_.bind (name, result) == -1) { delete result; - TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_RETURN (CORBA::UNKNOWN (), Logger::_nil ()); } else diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index c707f89e6c1..e6ac2f6efb5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -122,7 +122,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -160,7 +160,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, // Something went wrong with the internal structure else if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -171,7 +171,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -213,7 +213,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, oldentry); // Something went wrong with the internal structure if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -224,7 +224,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -262,7 +262,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, // Something went wrong with the internal structure else if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -273,7 +273,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -312,7 +312,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, entry, oldname, oldentry) < 0) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -322,7 +322,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, { CORBA::Object_ptr result = CORBA::Object::_nil (); ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (result); // Get the length of the name. @@ -398,7 +398,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n, CORBA::Environment &ACE_TRY_ENV) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -442,7 +442,7 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); TAO_Hash_Naming_Context *c_impl = 0; @@ -456,7 +456,7 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) ACE_NEW_THROW_EX (c, TAO_Naming_Context, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (result._retn ()); // Put c_impl into the auto pointer temporarily, in case next @@ -468,7 +468,7 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) poa_.in (), poa_id, this->hash_table_size_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (result._retn ()); // Allocation succeeded, get rid of auto pointer. @@ -505,7 +505,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); CosNaming::NamingContext_var result = @@ -542,7 +542,7 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; if (this->context_.current_size () != 0) @@ -588,21 +588,21 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many, bi = CosNaming::BindingIterator::_nil (); ACE_NEW_THROW_EX (bl, CosNaming::BindingList (0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // Obtain a lock before we proceed with the operation. ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Dynamically allocate hash map iterator. TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter = 0; ACE_NEW_THROW_EX (hash_iter, TAO_Hash_Naming_Context::HASH_MAP::ITERATOR (context_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // Number of bindings that will go into the BindingList. @@ -630,7 +630,7 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many, if (populate_binding (hash_entry, bl[i]) == 0) { delete hash_iter; - ACE_THROW (CORBA::NO_MEMORY(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY()); } } @@ -648,7 +648,7 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many, if (bind_iter == 0) { delete hash_iter; - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY ()); } ACE_TRY @@ -713,14 +713,14 @@ TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b, // bindings, we need to allocate an out parameter.) ACE_NEW_THROW_EX (binding, CosNaming::Binding, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); b = binding; ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); // If there are no more bindings. if (hash_iter_->done ()) @@ -731,7 +731,7 @@ TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b, hash_iter_->next (hash_entry); if (TAO_Hash_Naming_Context::populate_binding (hash_entry, *binding) == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0); hash_iter_->advance (); return 1; @@ -774,13 +774,13 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many, // parameter is allocated in case we fail to obtain the lock. ACE_NEW_THROW_EX (bl, CosNaming::BindingList (0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); // Obtain a lock. ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); // If there are no more bindings... @@ -801,7 +801,7 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many, hash_iter_->next (hash_entry); if (TAO_Hash_Naming_Context::populate_binding (hash_entry, bl[i]) == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0); if (hash_iter_->advance () == 0) { @@ -822,7 +822,7 @@ TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; PortableServer::POA_var poa = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 61edd90e9ef..6cc0e2b3a6b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -161,7 +161,7 @@ TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -200,7 +200,7 @@ TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n, // Something went wrong with the internal structure else if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -211,7 +211,7 @@ TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -248,7 +248,7 @@ TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n, CosNaming::nobject); // Something went wrong with the internal structure if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -259,7 +259,7 @@ TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -297,7 +297,7 @@ TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n, // Something went wrong with the internal structure else if (result == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } } @@ -308,7 +308,7 @@ TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -342,7 +342,7 @@ TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n, n[0].kind, nc, CosNaming::ncontext) < 0) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } CORBA::Object_ptr @@ -353,7 +353,7 @@ TAO_Persistent_Naming_Context::resolve (const CosNaming::Name& n, CosNaming::BindingType type; ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (result); // Get the length of the name. @@ -427,7 +427,7 @@ TAO_Persistent_Naming_Context::unbind (const CosNaming::Name& n, { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Get the length of the name. @@ -468,7 +468,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); TAO_Persistent_Naming_Context *c_impl = 0; @@ -488,7 +488,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) ACE_NEW_THROW_EX (c, TAO_Naming_Context, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (result._retn ()); // Put c into the auto pointer temporarily, in case next @@ -501,7 +501,7 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) poa_.in (), poa_id, this->hash_table_size_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (result._retn ()); // Allocation succeeded, get rid of auto pointer. @@ -549,7 +549,7 @@ TAO_Persistent_Naming_Context::bind_new_context (const CosNaming::Name& n, ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); CosNaming::NamingContext_var result = @@ -586,7 +586,7 @@ TAO_Persistent_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; if (this->context_.current_size () != 0) @@ -626,14 +626,14 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, bi = CosNaming::BindingIterator::_nil (); ACE_NEW_THROW_EX (bl, CosNaming::BindingList (0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // Obtain a lock before we proceed with the operation. ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; // Dynamically allocate hash map iterator. @@ -641,7 +641,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, ACE_NEW_THROW_EX (hash_iter, TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR (*(context_.map ())), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK; // Number of bindings that will go into the BindingList. @@ -669,7 +669,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, if (populate_binding (hash_entry, bl[i]) == 0) { delete hash_iter; - ACE_THROW (CORBA::NO_MEMORY(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY()); } } @@ -687,7 +687,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, if (bind_iter == 0) { delete hash_iter; - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::NO_MEMORY ()); } ACE_TRY @@ -752,7 +752,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b, // bindings, we need to allocate an out parameter.) ACE_NEW_THROW_EX (binding, CosNaming::Binding, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); b = binding; @@ -760,7 +760,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b, ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); // If there are no more bindings. if (hash_iter_->done ()) @@ -771,7 +771,7 @@ TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b, hash_iter_->next (hash_entry); if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, *binding) == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0); hash_iter_->advance (); return 1; @@ -814,14 +814,14 @@ TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many, // parameter is allocated in case we fail to obtain the lock. ACE_NEW_THROW_EX (bl, CosNaming::BindingList (0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); // Obtain a lock. ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); // If there are no more bindings... @@ -842,7 +842,7 @@ TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many, hash_iter_->next (hash_entry); if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, bl[i]) == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0); if (hash_iter_->advance () == 0) { @@ -863,7 +863,7 @@ TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, - CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::INTERNAL ()); ACE_CHECK; PortableServer::POA_var poa = diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index d5953cbb437..aaafc736ec8 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -523,7 +523,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // Is the pointer valid. if (entry_ptr == 0) - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); // If type is not the same, raise exception. if (entry_ptr->int_id_.pvalue_->type () != property_value.type ()) @@ -552,7 +552,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, } default: // Error. ret is -1 or rebind returned other than 1. - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); } return; @@ -802,7 +802,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, old_key, old_value) != 1) // Return values 0 and -1 are not possible. - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); else ACE_DEBUG ((LM_DEBUG, "Mode set succesful\n")); @@ -821,7 +821,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, old_key, old_value) != 1) // Return values 0 and -1 are not possible. - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); else ACE_DEBUG ((LM_DEBUG, "Mode set successful\n")); } @@ -840,7 +840,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, hash_key, hash_value) != 1) // Return values 0 and -1 are not possible. - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); else ACE_DEBUG ((LM_DEBUG, "Mode set successful\n")); } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp index 38b0089cc66..abd3ad1cd0b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp @@ -202,7 +202,7 @@ TAO_PropertySet<IF>::define_property (const char *property_name, // Is the pointer valid? if (entry_ptr == 0) - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); // If type is not the same, raise exception. if (entry_ptr->int_id_.pvalue_->type () != property_value.type ()) @@ -227,7 +227,7 @@ TAO_PropertySet<IF>::define_property (const char *property_name, } default: // Error. ret is -1 or rebid returned other than 1. - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); } return; @@ -693,7 +693,7 @@ TAO_PropertySet<IF>::delete_property (const char *property_name, { ACE_ERROR ((LM_ERROR, "Unbind failed\n")); - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); } // @@ Purify this and check. Deallocate the memory. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 3d6b6e6b2ae..53af7791ed0 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -257,7 +257,7 @@ TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV) this->time_interval (ACE_TRY_ENV).upper_bound - this->time_interval (ACE_TRY_ENV).lower_bound, 0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index dfb7d2e564c..9242d81009d 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -42,7 +42,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV) TAO_UTO (this->get_time (), this->inaccuracy (), this->time_displacement_factor ()), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); // Return the global time as a UTO. @@ -56,7 +56,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV) CosTime::UTO_ptr TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &env) { - env.exception (new CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::NO_IMPLEMENT ()); return 0; } @@ -74,7 +74,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, TAO_UTO (time, inaccuracy, tdf), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); return uto->_this (); } @@ -98,7 +98,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc, TAO_UTO (utc.time, inaccuracy, utc.tdf), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); return uto->_this (); } @@ -115,7 +115,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, ACE_NEW_THROW_EX (tio, TAO_TIO (lower, upper), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::TIO::_nil ()); return tio->_this (); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index a471667a3c2..ef145723be2 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -30,7 +30,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) + ACE_OS::gettimeofday ().usec () * 10), 0, 0), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); ACE_DEBUG ((LM_DEBUG, @@ -56,7 +56,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) CosTime::UTO_ptr TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &env) { - env.exception (new CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::NO_IMPLEMENT ()); return 0; } @@ -74,7 +74,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, TAO_UTO (time, inaccuracy, tdf), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); return uto->_this (); @@ -93,7 +93,7 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc, TAO_UTO (utc.time, utc.inacclo + utc.inacchi, utc.tdf), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::UTO::_nil ()); return uto->_this (); } @@ -110,7 +110,7 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, ACE_NEW_THROW_EX (tio, TAO_TIO (lower, upper), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::TIO::_nil ()); return tio->_this (); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 72afbc9fe0e..6a00579ab62 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -169,7 +169,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto, ACE_NEW_THROW_EX (tio, TAO_TIO (uto->time (ACE_TRY_ENV), this->time (ACE_TRY_ENV)), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_TRY_CHECK; } @@ -178,7 +178,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto, ACE_NEW_THROW_EX (tio, TAO_TIO (this->time (ACE_TRY_ENV), uto->time (ACE_TRY_ENV)), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_TRY_CHECK; } @@ -215,7 +215,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV) ACE_NEW_THROW_EX (tio, TAO_TIO (lower, upper), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index fb9837c4960..9deb1742e94 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -845,7 +845,7 @@ seen_request_id (TAO_Policies& policies, } if (seq == 0) - TAO_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 1); + TAO_THROW_RETURN (CORBA::NO_MEMORY (), 1); ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1); for (Request_Ids::ITERATOR riter (this->request_ids_); @@ -1831,7 +1831,7 @@ export_proxy (CosTrading::Lookup_ptr target, CosTrading::DuplicatePropertyName, CosTrading::DuplicatePolicyName)) { - TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::UNKNOWN (), 0); } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> @@ -1844,7 +1844,7 @@ withdraw_proxy (const char *id, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)) { - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> @@ -1857,7 +1857,7 @@ describe_proxy (const char *id, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)) { - TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::UNKNOWN (), 0); } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> @@ -1870,7 +1870,7 @@ list_proxies (CORBA::ULong how_many, TAO_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { - TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::UNKNOWN ()); } #endif /* TAO_TRADER_INTERFACES_C */ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 3f393b2567b..c43f62fd4ad 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -63,7 +63,7 @@ CC_Command::GetLockSet(char *lock_set_name, CORBA::Environment &TAO_IN_ENV) if(cc_lockset_.in()==0) { TAO_TRY_ENV.clear(); - TAO_TRY_ENV.exception (new CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_TRY_ENV.exception (new CORBA::UNKNOWN ()); } else return cc_lockset_; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index 9ae94db153e..31fe4279211 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -44,7 +44,7 @@ CC_naming_service::Init(CORBA::ORB_var orb, CORBA::Environment &TAO_IN_ENV) int success = init_naming_service (); if(success<0) - TAO_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA::INTERNAL ()); } CC_naming_service::~CC_naming_service (void) diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index ef97dd002d0..5e73e42cb0b 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -250,7 +250,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec, if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1) { // @@ TODO throw an application specific exception. - TAO_IN_ENV.exception (new CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_IN_ENV.exception (new CORBA::COMM_FAILURE ()); return; } ACE_INET_Addr ignore_from; diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 78c9fc1dc9e..4b6dd1a6d06 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -60,7 +60,7 @@ CORBA_Any::type (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } } diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp index c2635c5c435..05f8e94c306 100644 --- a/TAO/tao/CDR_Interpreter.cpp +++ b/TAO/tao/CDR_Interpreter.cpp @@ -287,7 +287,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, || kind <= CORBA::tk_void || kind == CORBA::tk_except) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -303,7 +303,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, // Pull encapsulation length out of the stream. if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -326,7 +326,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, if (nested.good_bit () == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -345,7 +345,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, if (stream->rd_ptr () != nested.rd_ptr ()) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } return size; @@ -373,7 +373,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, case CORBA::tk_wstring: if (stream->read_ulong (len) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } tc->length_ = len; @@ -384,7 +384,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, case CORBA::tk_sequence: if (stream->read_ulong (len) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } tc->length_ = len; @@ -401,7 +401,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0 && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -421,7 +421,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, CORBA::ULong temp; if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -456,7 +456,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, || offset >= -8 || ((-offset) & 0x03) != 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -467,7 +467,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, // Fetch indirected-to TCKind. if (!indirected_stream.read_ulong (temp)) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } kind = (CORBA::TCKind) temp; @@ -531,7 +531,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream, || !stream->skip_string () || !stream->read_ulong (members)) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -545,7 +545,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream, // Skip name of the member. if (!stream->skip_string ()) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -645,7 +645,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->skip_string () // type ID || !stream->skip_string ()) { // typedef name - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -672,7 +672,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_ulong (temp) // default used || !stream->read_ulong (members)) { // member count - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -701,7 +701,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_short (s)) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } } @@ -715,7 +715,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_long (l)) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } } @@ -728,14 +728,14 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_char (c)) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } } break; default: - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -743,7 +743,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->skip_string ()) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -756,7 +756,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, TAO_InputCDR temp (*stream); if (calc_union_attr_is_var_sized_member (&temp, var_sized_member) == -1) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -837,7 +837,7 @@ TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream, if (!stream->skip_string () // type ID || !stream->skip_string ()) // typedef name { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -869,7 +869,7 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream, if (stream->read_ulong (member_count) == 0 || member_count > UINT_MAX) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -894,7 +894,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, CORBA::ULong temp; if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -911,7 +911,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, || offset >= -8 || ((-offset) & 0x03) != 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } // Notice how we change the sign of the offset to estimate the @@ -923,7 +923,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, if (indirected_stream.read_ulong (temp) == 0 || temp == ~0u) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } } @@ -933,7 +933,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, // Skip the rest of the stream because we don't use it. if (stream->skip_bytes (stream->length ()) == 0) { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return 0; } @@ -988,7 +988,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ushort (discrim) != 0) retval = (discrim == *(CORBA::UShort *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; @@ -1000,7 +1000,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ulong (discrim) != 0) retval = (discrim == *(CORBA::ULong *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; @@ -1011,7 +1011,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ulong (discrim) != 0) retval = (discrim == *(unsigned *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; @@ -1022,7 +1022,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_boolean (discrim) != 0) retval = (discrim == *(CORBA::Boolean *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; @@ -1033,7 +1033,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_char (discrim) != 0) retval = (discrim == *(CORBA::Char *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; @@ -1044,12 +1044,12 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_wchar (discrim) != 0) retval = (discrim == *(CORBA::WChar *)value); else - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } break; default: - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); } return retval; diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index 9da2df0b262..81ce681245b 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -301,7 +301,7 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input, // If ObjectID not in table or reference is nil raise OBJECT_NOT_EXIST. if (CORBA::is_nil (object_reference) || status == -1) - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), -1); // ObjectID present in the table with an associated NON-NULL reference. // Throw a forward request exception. @@ -699,7 +699,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) default: // Unknown message ACE_DEBUG ((LM_DEBUG, "(%P|%t) Illegal message received by server\n")); - ACE_TRY_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_TRY_THROW (CORBA::COMM_FAILURE ()); // NOTREACHED case TAO_GIOP::CommunicationError: diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp index 891e51e092a..2874ba85dfc 100644 --- a/TAO/tao/CurrentS.cpp +++ b/TAO/tao/CurrentS.cpp @@ -101,7 +101,7 @@ void POA_CORBA::Current::_dispatch (CORBA::ServerRequest &req, void *context, CO // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - env.exception (new CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA_BAD_OPERATION ()); ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); } else diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp index 649b69a810c..b2d61422e54 100644 --- a/TAO/tao/DynEnum_i.cpp +++ b/TAO/tao/DynEnum_i.cpp @@ -218,202 +218,202 @@ void TAO_DynEnum_i::insert_boolean (CORBA::Boolean, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_octet (CORBA::Octet, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_char (CORBA::Char, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_short (CORBA::Short, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_ushort (CORBA::UShort, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_long (CORBA::Long, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_ulong (CORBA::ULong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_float (CORBA::Float, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_double (CORBA::Double, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_string (const char *, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_reference (CORBA::Object_ptr, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_longlong (CORBA::LongLong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_wchar (CORBA::WChar, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } void TAO_DynEnum_i::insert_any (const CORBA::Any&, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); } CORBA::Boolean TAO_DynEnum_i::get_boolean (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Octet TAO_DynEnum_i::get_octet (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Char TAO_DynEnum_i::get_char (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Short TAO_DynEnum_i::get_short (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::UShort TAO_DynEnum_i::get_ushort (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Long TAO_DynEnum_i::get_long (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::ULong TAO_DynEnum_i::get_ulong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Float TAO_DynEnum_i::get_float (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Double TAO_DynEnum_i::get_double (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } char * TAO_DynEnum_i::get_string (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Object_ptr TAO_DynEnum_i::get_reference (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::TypeCode_ptr TAO_DynEnum_i::get_typecode (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::LongLong TAO_DynEnum_i::get_longlong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); #if defined (ACE_LACKS_LONGLONG_T) CORBA::LongLong tmp = {0, 0}; @@ -426,21 +426,21 @@ TAO_DynEnum_i::get_longlong (CORBA::Environment &env) CORBA::ULongLong TAO_DynEnum_i::get_ulonglong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::WChar TAO_DynEnum_i::get_wchar (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } CORBA::Any_ptr TAO_DynEnum_i::get_any (CORBA::Environment& env) { - env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION ()); return 0; } diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index a1ec3fecbfc..f80fb03c972 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -257,7 +257,7 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) ACE_NEW_THROW_EX (retval, CORBA_Any (this->type (ACE_TRY_ENV), in_cdr.start ()), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; } @@ -1269,37 +1269,37 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_short: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Short>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_long: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Long>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ushort: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::UShort>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ulong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULong>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_boolean: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Boolean>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_char: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Char>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; @@ -1308,7 +1308,7 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_longlong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::LongLong>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; @@ -1317,19 +1317,19 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_ulonglong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULongLong>, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_wchar: ACE_NEW_THROW_EX (retval, WChar_extractor, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_enum: ACE_NEW_THROW_EX (retval, Enum_extractor, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return retval; default: diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 6d20e27718e..61abe8f1fb8 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -318,7 +318,7 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp, || stream.encode (CORBA::_tc_TypeCode, &CORBA::_tc_any, 0, TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW (CORBA_INITIALIZE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA_INITIALIZE ()); tcp = new CORBA::TypeCode (CORBA::tk_except, stream.length (), @@ -374,7 +374,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, || stream.encode (CORBA::_tc_TypeCode, &TC_completion_status, 0, TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW (CORBA_INITIALIZE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW (CORBA_INITIALIZE ()); // OK, we stuffed the buffer we were given (or grew a bigger one; // hope to avoid that during initialization). Now build and return diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 6a81f23aa9f..871451d8ba2 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -68,7 +68,7 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile, // iiop_profile->addr_to_string (), // "errno")); // -// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env); +// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (), env); // } // } // else diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index a98c68e194e..434ecd1c937 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -407,12 +407,12 @@ TAO_IIOP_Profile::parse_string (const char *string, string += 5; } else - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::MARSHAL (), 0); if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR || this->version_.minor > TAO_IIOP_Profile::DEF_IIOP_MINOR) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } // Pull off the "hostname:port/" part of the objref @@ -424,7 +424,7 @@ TAO_IIOP_Profile::parse_string (const char *string, if (cp == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } if (this->host_) @@ -453,7 +453,7 @@ TAO_IIOP_Profile::parse_string (const char *string, if (cp == 0) { CORBA::string_free (this->host_); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } this->port_ = (CORBA::UShort) ACE_OS::atoi (start); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 4fbe4a81dcb..3ba0b98e466 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -135,14 +135,14 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, // assert (this->stub_ != 0); if (this->stub_ == 0) - ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF ()); // Get a pointer to the connector registry, which might be in // thread-specific storage, depending on the concurrency model. TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry (); if (conn_reg == 0) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); // @@ It seems like this is the right spot to re-order the profiles // based on the policies in the ORB. @@ -171,7 +171,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, // Try moving to the next profile and starting over, if that // fails then we must raise the TRANSIENT exception. if (this->stub_->next_profile_retry () == 0) - ACE_THROW (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::TRANSIENT ()); } const TAO_ObjectKey& key = this->profile_->object_key(); @@ -201,7 +201,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, if (TAO_GIOP::start_message (message_type, this->out_stream_, this->orb_core_) == 0) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG); @@ -243,11 +243,11 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, break; default: - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL ()); } if (!this->out_stream_.good_bit ()) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR); } @@ -322,7 +322,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, { if (this->transport_ == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (), TAO_INVOKE_EXCEPTION); int result = @@ -417,7 +417,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // @@ If a forward exception or a LOCATION_FORWARD reply is sent // then the request couldn't have completed. But we need to // re-validate this to ensure "at most once" semantics. - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::MARSHAL (), TAO_INVOKE_EXCEPTION); } @@ -434,7 +434,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // @@ If a forward exception or a LOCATION_FORWARD reply is sent // then the request couldn't have completed. But we need to // re-validate this to ensure "at most once" semantics. - ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (), TAO_INVOKE_EXCEPTION); } @@ -464,7 +464,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // get created on a per-call basis. For now we'll play it safe. if (this->stub_->next_profile () == 0) - ACE_THROW_RETURN (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::TRANSIENT (), TAO_INVOKE_EXCEPTION); return TAO_INVOKE_RESTART; @@ -903,7 +903,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // to refactor them. if (this->transport_ == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (), TAO_INVOKE_EXCEPTION); int result = diff --git a/TAO/tao/LSOCK_Connector.cpp b/TAO/tao/LSOCK_Connector.cpp index 0ca41d74150..2ac68a3db3f 100644 --- a/TAO/tao/LSOCK_Connector.cpp +++ b/TAO/tao/LSOCK_Connector.cpp @@ -73,7 +73,7 @@ TAO_LSOCK_Connector::connect (TAO_Profile *profile, // lsock_profile->addr_to_string (), // "errno")); // -// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env); +// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (), env); // } // } // else diff --git a/TAO/tao/LSOCK_Profile.cpp b/TAO/tao/LSOCK_Profile.cpp index 0b2be8dd4fb..426e840543c 100644 --- a/TAO/tao/LSOCK_Profile.cpp +++ b/TAO/tao/LSOCK_Profile.cpp @@ -389,12 +389,12 @@ TAO_LSOCK_Profile::parse_string (const char *string, string += 5; } else - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::MARSHAL (), 0); if (this->version_.major != TAO_LSOCK_Profile::DEF_LSOCK_MAJOR || this->version_.minor > TAO_LSOCK_Profile::DEF_LSOCK_MINOR) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } // Pull off the "rendezvous_pointname:" part of the objref @@ -406,7 +406,7 @@ TAO_LSOCK_Profile::parse_string (const char *string, if (cp == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } if (this->rendezvous_point_) @@ -435,7 +435,7 @@ TAO_LSOCK_Profile::parse_string (const char *string, if (cp == 0) { CORBA::string_free (this->rendezvous_point_); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (), -1); } this->object_addr_.set (this->rendezvous_point_); diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp index 87d941e18c1..fd201da3141 100644 --- a/TAO/tao/Marshal.cpp +++ b/TAO/tao/Marshal.cpp @@ -86,7 +86,7 @@ TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc, { if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT) return this->mobj_table_[tc->kind_].obj_; - TAO_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index 27c8cd3f5ce..e780ab7cbf6 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -204,7 +204,7 @@ Messaging::RebindMode Messaging::RebindPolicy::rebind_mode ( { Messaging::RebindMode _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -276,7 +276,7 @@ Messaging::SyncScope Messaging::SyncScopePolicy::synchronization ( { Messaging::SyncScope _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -378,7 +378,7 @@ Messaging::PriorityRange Messaging::RequestPriorityPolicy::priority_range ( _tao_retval.min = 0; _tao_retval.max = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -452,7 +452,7 @@ Messaging::PriorityRange Messaging::ReplyPriorityPolicy::priority_range ( _tao_retval.min = 0; _tao_retval.max = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -528,7 +528,7 @@ TimeBase::UtcT Messaging::RequestStartTimePolicy::start_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -604,7 +604,7 @@ TimeBase::UtcT Messaging::RequestEndTimePolicy::end_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -680,7 +680,7 @@ TimeBase::UtcT Messaging::ReplyStartTimePolicy::start_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -756,7 +756,7 @@ TimeBase::UtcT Messaging::ReplyEndTimePolicy::end_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -828,7 +828,7 @@ TimeBase::TimeT Messaging::RelativeRequestTimeoutPolicy::relative_expiry ( { TimeBase::TimeT _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -900,7 +900,7 @@ TimeBase::TimeT Messaging::RelativeRoundtripTimeoutPolicy::relative_expiry ( { TimeBase::TimeT _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1002,7 +1002,7 @@ Messaging::RoutingTypeRange Messaging::RoutingPolicy::routing_range ( _tao_retval.min = Messaging::ROUTE_NONE; _tao_retval.max = Messaging::ROUTE_NONE; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1074,7 +1074,7 @@ CORBA::UShort Messaging::MaxHopsPolicy::max_hops ( { CORBA::UShort _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1146,7 +1146,7 @@ Messaging::Ordering Messaging::QueueOrderPolicy::allowed_orders ( { Messaging::Ordering _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); } CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1460,7 +1460,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1508,7 +1508,7 @@ char * Messaging::Poller::operation_name ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1556,7 +1556,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1604,7 +1604,7 @@ void Messaging::Poller::associated_handler ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF ()); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1624,7 +1624,7 @@ void Messaging::Poller::associated_handler ( if (!( (_tao_out << associated_handler) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -1653,7 +1653,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1701,7 +1701,7 @@ CORBA::Object_ptr Messaging::Poller::target ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1749,7 +1749,7 @@ char * Messaging::Poller::op_name ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp index a7ae5cc05a3..b77e56ae911 100644 --- a/TAO/tao/MessagingS.cpp +++ b/TAO/tao/MessagingS.cpp @@ -65,7 +65,7 @@ void* POA_Messaging::RebindPolicy::_downcast ( void POA_Messaging::RebindPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const @@ -162,7 +162,7 @@ void* POA_Messaging::SyncScopePolicy::_downcast ( void POA_Messaging::SyncScopePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const @@ -259,7 +259,7 @@ void* POA_Messaging::RequestPriorityPolicy::_downcast ( void POA_Messaging::RequestPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const @@ -356,7 +356,7 @@ void* POA_Messaging::ReplyPriorityPolicy::_downcast ( void POA_Messaging::ReplyPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const @@ -453,7 +453,7 @@ void* POA_Messaging::RequestStartTimePolicy::_downcast ( void POA_Messaging::RequestStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const @@ -550,7 +550,7 @@ void* POA_Messaging::RequestEndTimePolicy::_downcast ( void POA_Messaging::RequestEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const @@ -647,7 +647,7 @@ void* POA_Messaging::ReplyStartTimePolicy::_downcast ( void POA_Messaging::ReplyStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const @@ -744,7 +744,7 @@ void* POA_Messaging::ReplyEndTimePolicy::_downcast ( void POA_Messaging::ReplyEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const @@ -841,7 +841,7 @@ void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast ( void POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const @@ -938,7 +938,7 @@ void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast ( void POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const @@ -1035,7 +1035,7 @@ void* POA_Messaging::RoutingPolicy::_downcast ( void POA_Messaging::RoutingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const @@ -1132,7 +1132,7 @@ void* POA_Messaging::MaxHopsPolicy::_downcast ( void POA_Messaging::MaxHopsPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const @@ -1229,7 +1229,7 @@ void* POA_Messaging::QueueOrderPolicy::_downcast ( void POA_Messaging::QueueOrderPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const @@ -1323,7 +1323,7 @@ void* POA_Messaging::ReplyHandler::_downcast ( void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const @@ -1504,7 +1504,7 @@ void POA_Messaging::Poller::_get_operation_target_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1527,7 +1527,7 @@ void POA_Messaging::Poller::_get_operation_name_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1550,7 +1550,7 @@ void POA_Messaging::Poller::_get_associated_handler_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1567,7 +1567,7 @@ void POA_Messaging::Poller::_set_associated_handler_skel ( if (!( (_tao_in >> associated_handler.out ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); _tao_impl->associated_handler ( associated_handler.in (), @@ -1596,7 +1596,7 @@ void POA_Messaging::Poller::_get_is_from_poller_skel ( if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1619,7 +1619,7 @@ void POA_Messaging::Poller::_get_target_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1642,7 +1642,7 @@ void POA_Messaging::Poller::_get_op_name_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1736,7 +1736,7 @@ void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void *context, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 34f842d93f0..32f582ce0ee 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -226,7 +226,7 @@ CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env) if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) { - env.exception (new CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_PARAM ()); return 0; } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index d0668d5eb15..6d8ea87dd8b 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -908,7 +908,7 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, CORBA::Environment &ACE_TRY_ENV) { if (this->open () == -1) - ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::String id = 0; @@ -971,7 +971,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key, if (CORBA::is_nil (new_obj)) { data->_decr_refcnt (); - env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::INTERNAL ()); return CORBA::Object::_nil (); } @@ -1178,7 +1178,7 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) sizeof (CORBA::WChar), sizeof (void *))); - ACE_THROW (CORBA::INITIALIZE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INITIALIZE ()); } } CORBA_ORB::orb_init_count_++; @@ -1221,7 +1221,7 @@ CORBA::ORB_init (int &argc, // Check for errors and return 0 if error. if (result == -1) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); } // This (init_orb_globals) must come *after* ORB Core initialization. @@ -1396,7 +1396,7 @@ CORBA_ORB::ior_string_to_object (const char *str, if (tmp [0] && !isspace (tmp [0])) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ()); } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 5a9cc182a71..32759bb8b31 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -82,7 +82,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -103,7 +103,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, if (!( (_tao_out << type_id) )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -161,7 +161,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -198,7 +198,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); return _tao_retval; } @@ -268,7 +268,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, // is a no-no. if (ctx) { - TAO_THROW(CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::NO_IMPLEMENT ()); } request = new CORBA::Request (this, operation, arg_list, result, req_flags); } @@ -293,7 +293,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -331,10 +331,10 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); #else ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); #endif } diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index 77c23bcff69..599e73d8155 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -362,7 +362,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, if (result != 0) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } } diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index cfb4b2aaf65..fdfeb72ae62 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -268,33 +268,39 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (Porta PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::ThreadPolicy::_nil (); - if (!obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", ACE_TRY_ENV)) return PortableServer::ThreadPolicy::_nil (); TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = 0; if (obj->_is_collocated () && obj->_servant() != 0) servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ThreadPolicy:1.0"); +#if 0 // ongoing + else + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ThreadPolicy::_nil ()); +#else if (servant == 0) return new PortableServer::ThreadPolicy(stub); +#endif return new POA_PortableServer::_tao_collocated_ThreadPolicy( ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant), stub ); } +#if 1 // ongoing PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &ACE_TRY_ENV) { PortableServer::ThreadPolicyValue _tao_retval = (PortableServer::ThreadPolicyValue)0; TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -331,6 +337,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } +#endif CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { @@ -422,7 +429,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -550,7 +557,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -677,7 +684,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -807,7 +814,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -935,7 +942,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1063,7 +1070,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1156,7 +1163,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( return PortableServer::POAManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POAManager::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POAManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1343,7 +1350,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( return PortableServer::AdapterActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::AdapterActivator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::AdapterActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1404,7 +1411,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( return PortableServer::ServantManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantManager::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1465,7 +1472,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( return PortableServer::ServantActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantActivator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1527,7 +1534,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( return PortableServer::ServantLocator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantLocator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantLocator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1591,7 +1598,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow ( return PortableServer::POA::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -3175,7 +3182,7 @@ CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_Portabl PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ()); } PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV) @@ -3189,7 +3196,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval); diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 6b7060a8764..a9352a21ea6 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -339,7 +339,11 @@ TAO_NAMESPACE PortableServer{ static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ThreadPolicy_ptr _nil (void); +#if 1 // ongoing virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); +#else + virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; +#endif virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index bc5f5b6a527..1567907859a 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -123,7 +123,7 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } void POA_PortableServer::ThreadPolicy::_is_a_skel ( @@ -216,7 +216,7 @@ void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, voi if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -402,7 +402,7 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -496,7 +496,7 @@ void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -679,7 +679,7 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -773,7 +773,7 @@ void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &re if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -956,7 +956,7 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1050,7 +1050,7 @@ void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &re if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -1235,7 +1235,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1329,7 +1329,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerReque if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -1512,7 +1512,7 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1606,7 +1606,7 @@ void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -1789,7 +1789,7 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -1883,7 +1883,7 @@ void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerReques if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2048,7 +2048,7 @@ void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2233,7 +2233,7 @@ void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2376,7 +2376,7 @@ void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2509,7 +2509,7 @@ void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2675,7 +2675,7 @@ void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -2844,7 +2844,7 @@ void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *contex if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -3326,7 +3326,7 @@ void POA_PortableServer::Current::get_POA_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -3349,7 +3349,7 @@ void POA_PortableServer::Current::get_object_id_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -3443,7 +3443,7 @@ void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *co if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 852a0f95889..b4062def722 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -199,7 +199,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -247,7 +247,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -294,7 +294,7 @@ void CORBA_Policy::destroy ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF ()); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -446,7 +446,7 @@ CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides ( { CORBA_PolicyList* _tao_retval = 0; ACE_UNUSED_ARG(_tao_retval); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); } void CORBA_PolicyManager::set_policy_overrides ( @@ -455,7 +455,7 @@ void CORBA_PolicyManager::set_policy_overrides ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); } CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &env) diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp index 9f3263aba96..fc4a40bfaf5 100644 --- a/TAO/tao/PolicyS.cpp +++ b/TAO/tao/PolicyS.cpp @@ -127,7 +127,7 @@ void POA_CORBA::Policy::_get_policy_type_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -150,7 +150,7 @@ void POA_CORBA::Policy::copy_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -255,7 +255,7 @@ void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, COR // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - env.exception (new CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA_BAD_OPERATION ()); ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); } else @@ -371,7 +371,7 @@ void* POA_CORBA::PolicyManager::_downcast ( void POA_CORBA::PolicyManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { // @@ TODO - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const @@ -486,7 +486,7 @@ void* POA_CORBA::PolicyCurrent::_downcast ( void POA_CORBA::PolicyCurrent::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 6b8b653d830..7d61f7fdfe6 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -22,7 +22,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE) - ACE_THROW (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM ()); CORBA::InvalidPolicies invalid_policies; invalid_policies.indices.length (policies.length ()); diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index c2fe7d66370..9e4a8c926ae 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -80,7 +80,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -100,7 +100,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( if (!( (_tao_out << timeout) )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -134,7 +134,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -413,7 +413,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -461,7 +461,7 @@ void CORBA_PollableSet::add_pollable ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF ()); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -481,7 +481,7 @@ void CORBA_PollableSet::add_pollable ( if (!( (_tao_out << potential) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -516,7 +516,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -536,7 +536,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( if (!( (_tao_out << timeout) )) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); int _invoke_status = _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, ACE_TRY_ENV); @@ -575,7 +575,7 @@ void CORBA_PollableSet::remove ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF ()); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -595,7 +595,7 @@ void CORBA_PollableSet::remove ( if (!( (_tao_out << potential) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL ()); int _invoke_status = _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, ACE_TRY_ENV); @@ -624,7 +624,7 @@ CORBA::UShort CORBA_PollableSet::number_left ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 082b0f7fd1d..08f791e08a7 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -129,7 +129,7 @@ void POA_CORBA::Pollable::is_ready_skel ( if (!( (_tao_in >> timeout) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); _tao_retval = _tao_impl->is_ready ( timeout, @@ -142,7 +142,7 @@ void POA_CORBA::Pollable::is_ready_skel ( if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -165,7 +165,7 @@ void POA_CORBA::Pollable::create_pollable_set_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -256,7 +256,7 @@ void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, C if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -501,7 +501,7 @@ void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); @@ -657,7 +657,7 @@ void POA_CORBA::PollableSet::create_dii_pollable_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -674,7 +674,7 @@ void POA_CORBA::PollableSet::add_pollable_skel ( if (!( (_tao_in >> potential.out ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); _tao_impl->add_pollable ( potential.in (), @@ -698,7 +698,7 @@ void POA_CORBA::PollableSet::poll_skel ( if (!( (_tao_in >> timeout) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); _tao_retval = _tao_impl->poll ( timeout, @@ -711,7 +711,7 @@ void POA_CORBA::PollableSet::poll_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -728,7 +728,7 @@ void POA_CORBA::PollableSet::remove_skel ( if (!( (_tao_in >> potential.out ()) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); _tao_impl->remove ( potential.in (), @@ -757,7 +757,7 @@ void POA_CORBA::PollableSet::number_left_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL () ); } @@ -848,7 +848,7 @@ void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION ()); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp index 16a4aa0fd10..2e45d597563 100644 --- a/TAO/tao/Server_Request.cpp +++ b/TAO/tao/Server_Request.cpp @@ -122,7 +122,7 @@ IIOP_ServerRequest::parse_header_std (CORBA::Environment &ACE_TRY_ENV) } if (!hdr_status) - ACE_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::COMM_FAILURE ()); } @@ -164,7 +164,7 @@ IIOP_ServerRequest::parse_header_lite (CORBA::Environment &ACE_TRY_ENV) } if (!hdr_status) - ACE_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::COMM_FAILURE ()); } @@ -317,7 +317,7 @@ IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list, ACE_ERROR ((LM_ERROR, "IIOP_ServerRequest::arguments - " "%d bytes left in buffer\n", incoming_->length ())); - env.exception (new CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_PARAM ()); } } @@ -334,7 +334,7 @@ IIOP_ServerRequest::set_result (const CORBA::Any &value, // setting a result when another result already exists or if an exception // exists is an error if (this->retval_ || this->exception_) - env.exception (new CORBA::BAD_INV_ORDER (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_INV_ORDER ()); else { this->retval_ = new CORBA::Any (value); @@ -348,7 +348,7 @@ IIOP_ServerRequest::set_exception (const CORBA::Any &value, CORBA::Environment &env) { if (this->retval_ || this->exception_) - env.exception (new CORBA::BAD_INV_ORDER (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_INV_ORDER ()); else { // Try to narrow to ForwardRequest diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 126daf19787..798436bc064 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1240,7 +1240,7 @@ CORBA_TypeCode::private_name (CORBA::Environment &env) const return this->private_state_->tc_name_; } else - TAO_THROW_ENV_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::String)0); + TAO_THROW_ENV_RETURN (CORBA::INTERNAL (), env, (CORBA::String)0); } // No other typecodes ever have type IDs. default: @@ -1284,7 +1284,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // struct name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); this->private_state_->tc_member_count_known_ = 1; this->private_state_->tc_member_count_ = members; @@ -1310,14 +1310,14 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const || !skip_typecode (stream) // discriminant TC || !stream.read_ulong (members) // default used || !stream.read_ulong (members)) // real member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); this->private_state_->tc_member_count_known_ = 1; this->private_state_->tc_member_count_ = members; return this->private_state_->tc_member_count_; } default: - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); } ACE_NOTREACHED (return 0); } @@ -1369,13 +1369,13 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount]; if (this->private_state_->tc_member_type_list_ == 0) - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0); // compute the typecodes for all the members and // return the required one. @@ -1383,7 +1383,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, // the ith entry will have the typecode of the ith guy { if (!stream.skip_string ()) // skip the name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); CORBA::TypeCode::traverse_status status = stream.decode (CORBA::_tc_TypeCode, // the typecode will be @@ -1404,7 +1404,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1436,16 +1436,16 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, // @@EXC@@ Need to check allocation failure. this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount]; if (this->private_state_->tc_member_type_list_ == 0) - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0); // skip the id, name, and discrimant type part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !skip_typecode (stream)) // skip typecode for discriminant - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0); else if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); // Always big enough because labels can only be of a // few different types of which "long" has the // largest size. @@ -1467,7 +1467,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, if (status != CORBA::TypeCode::TRAVERSE_CONTINUE || !stream.skip_string ()) // skip the name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); status = stream.decode (CORBA::_tc_TypeCode, // get the typecode &private_state_->tc_member_type_list_[i], @@ -1476,7 +1476,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1533,20 +1533,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // enum name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0); // compute the typecodes for all the members and // return the required one. for (CORBA::ULong i = 0; i < mcount; i++) // now skip this name if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0); this->private_state_->tc_member_name_list_known_ = 1; @@ -1580,20 +1580,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // struct/except name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0); // compute the typecodes for all the members and // return the required one. for (CORBA::ULong i = 0; i < mcount; i++) if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]) || !skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); this->private_state_->tc_member_name_list_known_ = 1; @@ -1626,16 +1626,16 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, 0); // skip the id, name, and discrimant type part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !skip_typecode (stream)) // skip typecode for discriminant - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0); else if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); else { CORBA::Long scratch; // always big enough because labels can @@ -1656,12 +1656,12 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); // skip typecode for member if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]) || (!skip_typecode (stream))) // skip typecode - TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (), env, 0); } this->private_state_->tc_member_name_list_known_ = 1; @@ -1709,7 +1709,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, ACE_DEBUG ((LM_DEBUG, "TypeCode::private_member_label -- " "error reading from stream")); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } // Double checked locking... @@ -1730,7 +1730,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, CORBA::Any_ptr* label_list; ACE_NEW_THROW_EX (label_list, CORBA::Any_ptr [member_count], - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); // get the discriminant TC @@ -1775,7 +1775,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, // @@EXC@@ Need to check memory allocation failure. ACE_NEW_THROW_EX (label_list[i], CORBA::Any (tc, out.begin ()), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); if (stream.skip_string () == 0 @@ -1786,7 +1786,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, "TypeCode::private_member_label " "error getting typecode for member %d\n", i)); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } } @@ -1821,7 +1821,7 @@ CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const || stream.decode (CORBA::_tc_TypeCode, &this->private_state_->tc_discriminator_type_, this, env) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); this->private_state_->tc_discriminator_type_known_ = 1; return this->private_state_->tc_discriminator_type_; @@ -1845,7 +1845,7 @@ CORBA_TypeCode::private_default_index (CORBA::Environment &env) const || !stream.skip_string () // typedef name || !skip_typecode (stream) // skip discriminant || !stream.read_long (this->private_state_->tc_default_index_used_)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); this->private_state_->tc_default_index_used_known_ = 1; return this->private_state_->tc_default_index_used_; @@ -1870,7 +1870,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const // skip the typecode of the element and get the bounds if (!skip_typecode (stream) // skip typecode || !stream.read_ulong (this->private_state_->tc_length_)) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); else { this->private_state_->tc_length_known_ = 1; @@ -1894,7 +1894,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const return this->private_state_->tc_length_; } else - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); } ACE_NOTREACHED (break); @@ -1929,7 +1929,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // element type - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); else { this->private_state_->tc_content_type_known_ = 1; @@ -1948,7 +1948,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const if (!stream.skip_string () // typeID || !stream.skip_string ()) // name - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &this->private_state_->tc_content_type_, this, @@ -1956,7 +1956,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); else { this->private_state_->tc_content_type_known_ = 1; @@ -2040,7 +2040,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // struct name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return 3 + 2 * members; } @@ -2056,7 +2056,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // typedef name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return 3 + members; } @@ -2074,7 +2074,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const || !skip_typecode (stream) // discriminant TC || !stream.read_ulong (members) // default used || !stream.read_ulong (members)) // real member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return 5 + 3 * members; } @@ -2118,11 +2118,11 @@ CORBA_TypeCode::ulong_param (CORBA::ULong n, this->byte_order_); if (!skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); // Then comes the "bounds" parameter. if (!stream.read_ulong (temp)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return temp; } @@ -2134,7 +2134,7 @@ CORBA_TypeCode::ulong_param (CORBA::ULong n, break; return this->length_; } - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); } // Internal hack, used until member_type (), discriminator_type (), @@ -2183,7 +2183,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return tc; case CORBA::tk_alias: // #1 is a tc @@ -2191,13 +2191,13 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, break; if (!stream.skip_string () // type ID, hidden || !stream.skip_string ()) // typedef name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, this, env); TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return tc; case CORBA::tk_except: @@ -2210,7 +2210,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, || !stream.skip_string () // typedef name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); temp = (n - 3) / 2; @@ -2219,10 +2219,10 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, // skip to the member being asked if (!stream.skip_string () // member name || !skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); if (!stream.skip_string ()) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, @@ -2231,7 +2231,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return tc; case CORBA::tk_union: // #6 and up are tc, index from 0 @@ -2240,7 +2240,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, if (!stream.skip_string () // type ID, hidden || !stream.skip_string ()) // typedef name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, this, @@ -2248,12 +2248,12 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // TC - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count { CORBA::release (tc); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); } if (n == 2) @@ -2268,7 +2268,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, for (i = 0; i < temp; i++) { status = stream.decode (tc, &scratch, this, env); // member label - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE @@ -2276,7 +2276,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, || !skip_typecode (stream)) { // member typecode CORBA::release (tc); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); } } // member label @@ -2289,7 +2289,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, if (status != CORBA::TypeCode::TRAVERSE_CONTINUE || !stream.skip_string ()) // member name - TAO_TRY_THROW (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + TAO_TRY_THROW (CORBA::BAD_TYPECODE ()); } TAO_CATCHANY { @@ -2306,11 +2306,11 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); return tc; } - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0); } // Tell user the size of an instance of the data type described by @@ -2320,7 +2320,7 @@ size_t CORBA::TypeCode::private_size (CORBA::Environment &env) { if (kind_ >= CORBA::TC_KIND_COUNT) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); env.clear (); @@ -2358,7 +2358,7 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &env) env.clear (); if (kind_ >= CORBA::TC_KIND_COUNT) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0); // Double checked locking... ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 2594fc4871a..a7eb1775059 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -205,7 +205,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode: " "Bad kind_ value in CDR stream\n")); - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -466,7 +466,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -612,7 +612,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "marshaling TAO_Marshal_Sequence::append detected error\n")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -657,7 +657,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::append detected error")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index c40b8785e48..0c3575a3a47 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -514,7 +514,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, } else // bad kind_ value to be decoded { - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode:decode: " @@ -859,7 +859,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -1182,7 +1182,7 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr tc, // If an error was detected but no exception was raised then raise a // marshal exception. if (env.exception () == 0) - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1333,7 +1333,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::decode detected error\n")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index 948a2f6db92..6d647935f40 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -379,7 +379,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, discrim_matched = 1; break; default: - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, CORBA::TypeCode::TRAVERSE_STOP); }// end of switch @@ -638,7 +638,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::deep_free detected error\n")); // error exit - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (), env, CORBA::TypeCode::TRAVERSE_STOP); } ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP); } diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 0d43165b0c5..75fc7db7c37 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -581,7 +581,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, "Union::encode - failed. " "No match and no default case\n")); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -822,7 +822,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, // If an error was detected but no exception was raised then raise a // marshal exception. if (env.exception () == 0) - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -972,7 +972,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::encode detected error\n")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index a2e1d9b43b4..b6dca5d281c 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -202,7 +202,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::skip: " "Bad kind_ value in CDR stream")); - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -519,7 +519,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE ()); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -657,7 +657,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::skip detected error\n")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -696,7 +696,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::skip detected error\n")); - env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL ()); return CORBA::TypeCode::TRAVERSE_STOP; } diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index 0d2a59da11b..cc2c89025b3 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -70,7 +70,7 @@ catiiop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA_DATA_CONVERSION ()); return 0; } @@ -88,7 +88,7 @@ catiiop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA_DATA_CONVERSION ()); CORBA::string_free (hostname); return 0; } @@ -401,7 +401,7 @@ catpoop (CORBA::String string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + env.exception (new CORBA_DATA_CONVERSION ()); return 0; } |