diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-03 20:23:35 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-03 20:23:35 +0000 |
| commit | a9bd56a4f7b7958e87e13752c287f5056b7e3fdb (patch) | |
| tree | 8c4c5f9b7c85a50b26ec8a62898784e9e1f0f607 | |
| parent | d8a6f7fedc4ba8f53b5a17ee4b33ee0a75a8c352 (diff) | |
| download | ATCD-a9bd56a4f7b7958e87e13752c287f5056b7e3fdb.tar.gz | |
ChangeLogTag:Thu Jun 3 15:16:04 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
57 files changed, 1007 insertions, 911 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 958c9fb3821..c6453cd29e5 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,73 @@ +Thu Jun 3 15:16:04 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/corbafwd.h: + * tao/corbafwd.i: + * tao/ORB_Core.cpp: + Some compilers get extremely confused with + CORBA::default_environment() as a default parameter. But they + are happy with a function outside the CORBA namespace, for + example: TAO_default_environment + We added the function above and made the + CORBA::default_environment() just a thin wrapper. + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: + The IDL compiler generates TAO_default_environment now. + + * tao/Any.h: + * tao/CDR.h: + * tao/CDR_Interpreter.h: + * tao/Context.h: + * tao/CurrentC.h: + * tao/DomainC.h: + * tao/Exception.h: + * tao/Forwarding_Servant.h: + * tao/GIOP.h: + * tao/GIOP.cpp: + * tao/GIOP_Server_Request.h: + * tao/IIOP_Connect.h: + * tao/Invocation.h: + * tao/Marshal.h: + * tao/Messaging_Policy_i.h: + * tao/NVList.h: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORB_Core.h: + * tao/Object.h: + * tao/POA.h: + * tao/POAC.h: + * tao/POAManager.h: + * tao/POAS.h: + * tao/POA_CORBA.h: + * tao/PolicyC.h: + * tao/Policy_Manager.h: + * tao/PollableC.h: + * tao/Request.h: + * tao/Sequence.h: + * tao/Sequence_T.h: + * tao/Servant_Base.h: + * tao/Server_Request.h: + * tao/Stub.h: + * tao/TAO.h: + * tao/Typecode.h: + * tao/UIOP_Connect.h: + * tao/varout.h: + * orbsvcs/CosEvent_Service/CosEvent_Service.h: + * orbsvcs/Time_Service/IR_Helper.h: + * orbsvcs/orbsvcs/Event/EC_Command.cpp: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * performance-tests/Cubit/TAO/DII_Cubit/client.cpp: + Replaced all uses of CORBA::default_environment() with + TAO_default_environment() + Thu Jun 03 14:54:23 1999 Irfan Pyarali <irfan@cs.wustl.edu> * tao/poa_T.*: Removed unused files. diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index b926dfc27d4..f2d84c938ad 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1687,7 +1687,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env =" << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } @@ -1738,7 +1738,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env =" << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } @@ -1785,7 +1785,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 6711f5197fa..89f264d9671 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -161,14 +161,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "static " << node->local_name () << "_ptr " << "_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n"; @@ -188,7 +188,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const CORBA::Char *type_id, " << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "virtual const char* " diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index 6c5ef47158f..15b60a36d95 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -111,7 +111,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -125,7 +125,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -136,7 +136,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -145,14 +145,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "CORBA::ServerRequest &_tao_req," << be_nl << "void *_tao_context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; // Print out the _this() method. *os << node->name () << " *_this (" << be_idt << be_idt_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index e93e0b40e81..4892051d8b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -116,7 +116,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 969e55e2c04..71ed8c459f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -71,7 +71,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) os->indent (); *os << "CORBA::Environment &ACE_TRY_ENV"; *os << " = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt; break; case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index 0e3244afec0..406daad2b87 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -139,7 +139,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) << "void *_tao_obj, " << be_nl << "void *_tao_context, " << be_nl << "CORBA::Environment &_tao_env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp index b453bbe12d2..d16b35b5528 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp @@ -157,7 +157,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) << "void* target," << be_nl << "CORBA_Object *src," << be_nl << "CORBA_Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp index 3edf1668afd..98259e83e53 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp @@ -147,7 +147,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) << "void* target," << be_nl << "CORBA_Object *src," << be_nl << "CORBA_Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 9fbe2ab935a..5f4b00a0966 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -244,11 +244,11 @@ be_visitor_union_branch_private_ch::visit_predefined_type (be_predefined_type *n // check if we are dealing with a CORBA::Object if (!ACE_OS::strcmp (bt->local_name ()->get_string (), "Object")) { - *os << "TAO_Object_Field_T<CORBA::Object> *" << ub->local_name () + *os << "TAO_Object_Field_T<CORBA::Object> *" << ub->local_name () << "_;\n"; } else - *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () + *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () << "_;\n"; } else if (node->pt () == AST_PredefinedType::PT_any) diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h index b4cfd607b1a..1da8c9c004c 100644 --- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h +++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h @@ -48,7 +48,7 @@ class CosEvent_Service : public CosEC_ServantBase // Returns 0 on success, -1 on error. void shutdown (CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Shutdown the COS Event Service. // Returns 0 on success, -1 on error. diff --git a/TAO/orbsvcs/Time_Service/IR_Helper.h b/TAO/orbsvcs/Time_Service/IR_Helper.h index 0fcf9f63b8c..e6b7f4d1bf4 100644 --- a/TAO/orbsvcs/Time_Service/IR_Helper.h +++ b/TAO/orbsvcs/Time_Service/IR_Helper.h @@ -40,27 +40,27 @@ public: // Destructor void notify_startup (CORBA_Environment &_env = - CORBA::default_environment ()); + TAO_default_environment ()); // Notify the IR that the server is now running. void notify_shutdown (CORBA_Environment &_env = - CORBA::default_environment ()); + TAO_default_environment ()); // Notify the IR that the server has been shut down. int register_server (const char *comm_line, const char *environment = "", const char *working_dir = "", CORBA_Environment &_env = - CORBA::default_environment ()); + TAO_default_environment ()); // Tell the IR how to start yourself up. void change_object (CORBA::Object_ptr obj, CORBA_Environment &_env = - CORBA::default_environment ()); + TAO_default_environment ()); // Convert an object into a IR controlled object. private: int read_ir_ior (CORBA_Environment &_env = - CORBA::default_environment ()); + TAO_default_environment ()); char *name_; char *ir_key_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp index 2590494e730..b3808aa30bc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp @@ -14,7 +14,7 @@ ACE_RCSID(Event, EC_Command, "$Id$") template<class Target, class Object> int TAO_EC_Connected_Command<Target,Object>::execute (void* arg) { - CORBA::Environment *env = &CORBA::default_environment (); + CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); @@ -27,7 +27,7 @@ TAO_EC_Connected_Command<Target,Object>::execute (void* arg) template<class Target, class Object> int TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg) { - CORBA::Environment *env = &CORBA::default_environment (); + CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); @@ -40,7 +40,7 @@ TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg) template<class Target> int TAO_EC_Shutdown_Command<Target>::execute (void* arg) { - CORBA::Environment *env = &CORBA::default_environment (); + CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 3cc9cd8b303..50b0a0f3c92 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -113,9 +113,9 @@ public: // = The Servant methods virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); private: CORBA::Boolean is_connected_i (void) const; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index fc79092b87f..3b92c511b3b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -148,9 +148,9 @@ public: // = The Servant methods virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); private: CORBA::Boolean is_connected_i (void) const; diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index 6e6afc04eca..a5141f56344 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -48,7 +48,7 @@ if (this->env_.exception () != 0) \ return; \ } -class DII_Cubit_Client +class DII_Cubit_Client { // = TITLE // Defines a class that encapsulates behaviour of a Cubit client @@ -88,7 +88,7 @@ private: // Prints the timing stats. // = DII versions of Cubit operations: - + void cube_short_dii (void); void cube_long_dii (void); void cube_octet_dii (void); @@ -111,7 +111,7 @@ private: static char *stats_messages_[]; // Array of labels for passing to print_stats. - + int argc_; // # of arguments on the command line. @@ -154,9 +154,9 @@ private: // Constructor DII_Cubit_Client::DII_Cubit_Client (void) - : loop_count_ (DEFAULT_LOOP_COUNT), + : loop_count_ (DEFAULT_LOOP_COUNT), shutdown_ (0), - env_ (CORBA::default_environment ()), + env_ (TAO_default_environment ()), orb_var_ (0), factory_var_ (CORBA::Object::_nil ()), obj_var_ (CORBA::Object::_nil ()), @@ -223,8 +223,8 @@ DII_Cubit_Client::init (int argc, char **argv) -1); // Get a factory object reference from the factory IOR. - this->factory_var_ = - this->orb_var_->string_to_object (this->factory_IOR_, + this->factory_var_ = + this->orb_var_->string_to_object (this->factory_IOR_, ACE_TRY_ENV); ACE_TRY_CHECK; @@ -232,7 +232,7 @@ DII_Cubit_Client::init (int argc, char **argv) CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit", ACE_TRY_ENV)); ACE_TRY_CHECK; - + // make_cubit takes a char* arg that it doesn't use, but we must // still include it in the request. CORBA::String dummy = ""; @@ -242,9 +242,9 @@ DII_Cubit_Client::init (int argc, char **argv) mc_req->set_return_type (CORBA::_tc_Object); // Insert the result-holding variable into the request. - mc_req->result ()->value ()->replace (CORBA::_tc_Object, + mc_req->result ()->value ()->replace (CORBA::_tc_Object, &this->obj_var_, - 0, + 0, ACE_TRY_ENV); ACE_TRY_CHECK; @@ -276,17 +276,17 @@ DII_Cubit_Client::parse_args (void) ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x"); int c; int result; - + while ((c = opts ()) != -1) - switch (c) + switch (c) { case 'd': // debug flag TAO_debug_level++; break; case 'n': // loop count this->loop_count_ = ACE_OS::atoi (opts.optarg); - break; - case 'i': // Get the IOR from the command line. + break; + case 'i': // Get the IOR from the command line. this->factory_IOR_ = opts.optarg; break; case 'f': // Read the IOR from the file. @@ -297,7 +297,7 @@ DII_Cubit_Client::parse_args (void) opts.optarg), -1); break; - case 'x': // Shut down server after test run. + case 'x': // Shut down server after test run. this->shutdown_ = 1; break; case '?': @@ -349,7 +349,7 @@ DII_Cubit_Client::print_stats (const char *call_name, "%s:\n", call_name)); - if (this->call_count_ > 0 + if (this->call_count_ > 0 && this->error_count_ == 0) { #if defined (ACE_LACKS_FLOATING_POINT) @@ -417,7 +417,7 @@ DII_Cubit_Client::cube_short_dii (void) req->return_value () >>= ret_short; - if (ret_short != arg_short * arg_short * arg_short) + if (ret_short != arg_short * arg_short * arg_short) { ACE_ERROR ((LM_ERROR, "cube_short_dii -- bad results\n")); @@ -451,7 +451,7 @@ DII_Cubit_Client::cube_long_dii (void) req->return_value () >>= ret_long; - if (ret_long != arg_long * arg_long * arg_long) + if (ret_long != arg_long * arg_long * arg_long) { ACE_ERROR ((LM_ERROR, "cube_long_dii -- bad results\n")); @@ -488,7 +488,7 @@ DII_Cubit_Client::cube_octet_dii (void) CORBA::Any::to_octet to_ret_octet (ret_octet); req->return_value () >>= to_ret_octet; - if (ret_octet != arg_octet * arg_octet * arg_octet) + if (ret_octet != arg_octet * arg_octet * arg_octet) { ACE_ERROR ((LM_ERROR, "cube_octet_dii -- bad results\n")); @@ -499,7 +499,7 @@ DII_Cubit_Client::cube_octet_dii (void) void DII_Cubit_Client::cube_union_dii (void) -{ +{ // Create the request ... CORBA::Request_var req (this->obj_var_->_request ("cube_union", this->env_)); @@ -516,7 +516,7 @@ DII_Cubit_Client::cube_union_dii (void) // A different discrim value than arg_ret, just to be ornery. ret_union._d(Cubit::e_1st); ret_union.s (0); - + // Add the union to the request arg list and set the return type. req->add_in_arg () <<= arg_union; @@ -534,15 +534,15 @@ DII_Cubit_Client::cube_union_dii (void) Cubit::oneof* ret_ptr = &ret_union; req->return_value () >>= ret_ptr; - if (ret_union.cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l - || ret_union.cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s - || ret_union.cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o) + if (ret_union.cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l + || ret_union.cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s + || ret_union.cm ().o != arg_union.cm ().o * arg_union.cm ().o * arg_union.cm ().o) { ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n")); this->error_count_++; - } + } } void @@ -575,9 +575,9 @@ DII_Cubit_Client::cube_struct_dii (void) req->return_value () >>= ret_struct_ptr; - if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l - || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s - || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o) + if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l + || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s + || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o) { ACE_ERROR ((LM_ERROR, "cube_struct_dii -- bad results\n")); @@ -599,7 +599,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) // Return value holder is set to a different length to test resizing. Cubit::octet_seq arg_octet_seq (length), *ret_octet_seq_ptr; arg_octet_seq.length (length); - arg_octet_seq[0] = 4; + arg_octet_seq[0] = 4; // Add octet sequence to the request arg list @@ -618,7 +618,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) req->return_value () >>= ret_octet_seq_ptr; // Check for correct length. - if (ret_octet_seq_ptr->length () != arg_octet_seq.length ()) + if (ret_octet_seq_ptr->length () != arg_octet_seq.length ()) { ACE_ERROR ((LM_ERROR, "cube_octet_seq_dii -- bad length\n")); @@ -627,7 +627,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length) } // Check for correct value(s). - if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0]) + if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0]) { ACE_ERROR ((LM_ERROR, "cube_octet_seq_dii -- bad results\n")); @@ -669,7 +669,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length) req->return_value () >>= ret_long_seq_ptr; // Check for correct length. - if (ret_long_seq_ptr->length () != arg_long_seq.length ()) + if (ret_long_seq_ptr->length () != arg_long_seq.length ()) { ACE_ERROR ((LM_ERROR, "cube_long_seq_dii -- bad length\n")); @@ -678,7 +678,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length) } // Check for correct value(s). - if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0]) + if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0]) { ACE_ERROR ((LM_ERROR, "cube_long_seq_dii -- bad results\n")); @@ -746,7 +746,7 @@ DII_Cubit_Client::run (void) (this->*op_array_[j])(); dii_timer.stop (); - dii_timer.elapsed_time (dii_elapsed_time); + dii_timer.elapsed_time (dii_elapsed_time); this->print_stats (this->stats_messages_[j], dii_elapsed_time); } diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 4401d05fd27..61153cd8ddc 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -250,14 +250,14 @@ public: const void *value, CORBA::Boolean any_owns_data, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. void replace (CORBA::TypeCode_ptr type, const void *value, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. This uses a default value for the "any_owns_data" parameter @@ -266,7 +266,7 @@ public: void type (CORBA::TypeCode_ptr type, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // For use along with <<= of a value of aliased type when the alias must // be preserved. @@ -296,7 +296,7 @@ public: void _tao_replace (CORBA::TypeCode_ptr, const ACE_Message_Block *mb, CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Replace via message block instead of <value_>. void _tao_replace (CORBA::TypeCode_ptr type, @@ -304,14 +304,14 @@ public: CORBA::Boolean any_owns_data, void* value, CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Replace all the contents of the any, used in the <<= operators. void _tao_replace (CORBA::TypeCode_ptr type, CORBA::Boolean any_owns_data, void* value, CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Replace the value of the Any, used in the >>= operators. #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 0a100768379..43f0ac95080 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -108,7 +108,7 @@ public: CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Append the contents of the CDR stream based on information // described by <tc>; returning any errors in <TAO_IN_ENV>. @@ -121,7 +121,7 @@ public: const void *data, const void *, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Marshalls the contents of <data> as described by the TypeCode in // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter. @@ -218,14 +218,14 @@ public: const void *data, const void *, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Demarshall the contents of the CDR stream into <data> as // described by <tc>; returning any errors in <TAO_IN_ENV>. CORBA::TypeCode::traverse_status skip ( CORBA::TypeCode_ptr tc, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Skip the contents of the CDR stream based on information // described by <tc>; returning any errors in <TAO_IN_ENV>. diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h index c28e40891a5..f1c2ec595f0 100644 --- a/TAO/tao/CDR_Interpreter.h +++ b/TAO/tao/CDR_Interpreter.h @@ -106,12 +106,12 @@ public: static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, TAO_InputCDR *original_stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream, CORBA::TCKind kind, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // For a given typecode, figure out its size and alignment needs. // This version is used mostly when traversing other typecodes, and // follows these rules: @@ -144,7 +144,7 @@ public: static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream, size_t &alignment, CORBA::Boolean is_exception, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Given typecode bytes for a structure (or exception), figure out // its alignment and size; return size, alignment is an 'out' // parameter. Only "CORBA::tk_struct" (or "CORBA::tk_except") has @@ -162,14 +162,14 @@ public: static size_t calc_struct_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a structure. #if defined (TAO_NO_COPY_OCTET_SEQUENCES) static size_t calc_seq_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a sequence, most of them have // the same requirements, but for the sequences of Octets that are // optimized to minimize copying. @@ -177,13 +177,13 @@ public: static size_t calc_exception_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for an exception. static size_t calc_union_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a CORBA discriminated union. // // Note that this is really a two-element structure. The first @@ -195,12 +195,12 @@ public: static size_t calc_alias_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a typedeffed type. static size_t calc_array_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment of an array. (All such arrays are // described as single dimensional, even though the IDL definition // may specify a multidimensional array ... such arrays are treated @@ -209,14 +209,14 @@ public: static CORBA::Boolean match_value (CORBA::TCKind kind, TAO_InputCDR *tc_stream, const void *value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Cast the discriminant values to the right type and compare them. static size_t calc_key_union_attributes (TAO_InputCDR *stream, size_t &overall_alignment, size_t &discrim_size_with_pad, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // = Utility routine that checks if a union member is a variable sized type diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h index f24fd9d4939..2e3a0b9538f 100644 --- a/TAO/tao/Context.h +++ b/TAO/tao/Context.h @@ -55,38 +55,38 @@ public: const char *context_name ( CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ) const; CORBA_Context_ptr parent ( CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ) const; void create_child (const char *child_ctx_name, CORBA_Context_out child_ctx, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void set_one_value (const char *propname, const CORBA_Any &propvalue, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void set_values (CORBA::NVList_ptr values, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void delete_values (const char *propname, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void get_values (const char *start_scope, CORBA::Flags op_flags, const char *pattern, CORBA::NVList_ptr &values, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 typedef CORBA_Context_ptr _ptr_type; @@ -206,12 +206,12 @@ public: char *item (CORBA::ULong index, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // return the typecode at index i. Raises the "Bounds" exception void remove (CORBA::ULong index, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // remove the typecode at index i. Raises the "Bounds" exception #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 065c65cf8e1..693c7683dbb 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -114,11 +114,14 @@ class CORBA_Current : public virtual ACE_CORBA_1 (Object) // the static operations static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj); - static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); static CORBA_Current_ptr _nil (void); virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 4b82e22e0e6..39e90a389cf 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -35,14 +35,14 @@ public: CORBA_DomainManager_var (CORBA_DomainManager_ptr); CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor ~CORBA_DomainManager_var (void); // destructor - + CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr); CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &); CORBA_DomainManager_ptr operator-> (void) const; - + operator const CORBA_DomainManager_ptr &() const; operator CORBA_DomainManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DomainManager_ptr in (void) const; CORBA_DomainManager_ptr &inout (void); CORBA_DomainManager_ptr &out (void); @@ -65,7 +65,7 @@ public: operator CORBA_DomainManager_ptr &(); CORBA_DomainManager_ptr &ptr (void); CORBA_DomainManager_ptr operator-> (void); - + private: CORBA_DomainManager_ptr &ptr_; }; @@ -82,32 +82,32 @@ public: static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj); static CORBA_DomainManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = - CORBA::default_environment () + CORBA::Environment &env = + TAO_default_environment () ); static CORBA_DomainManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = - CORBA::default_environment () + CORBA::Environment &env = + TAO_default_environment () ); static CORBA_DomainManager_ptr _nil (void); virtual CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = - CORBA::default_environment () + const CORBA::Char *type_id, + CORBA::Environment &env = + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DomainManager (void); - CORBA_DomainManager (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DomainManager (TAO_Stub *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DomainManager (void); @@ -119,16 +119,16 @@ private: // ************************************************************* // DomainManagerList // ************************************************************* - + class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager> { public: CORBA_DomainManagerList (void); // default ctor CORBA_DomainManagerList (CORBA::ULong max); // uses max size CORBA_DomainManagerList ( - CORBA::ULong max, - CORBA::ULong length, - CORBA_DomainManager_ptr *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA_DomainManager_ptr *buffer, CORBA::Boolean release=0 ); CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor @@ -148,18 +148,18 @@ public: CORBA_DomainManagerList_var (CORBA_DomainManagerList *); CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor ~CORBA_DomainManagerList_var (void); // destructor - + CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *); CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &); CORBA_DomainManagerList *operator-> (void); const CORBA_DomainManagerList *operator-> (void) const; - + operator const CORBA_DomainManagerList &() const; operator CORBA_DomainManagerList &(); operator CORBA_DomainManagerList &() const; - + TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const CORBA_DomainManagerList &in (void) const; CORBA_DomainManagerList &inout (void); CORBA_DomainManagerList *&out (void); @@ -181,9 +181,9 @@ public: operator CORBA_DomainManagerList *&(); CORBA_DomainManagerList *&ptr (void); CORBA_DomainManagerList *operator-> (void); - + TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong index); - + private: CORBA_DomainManagerList *&ptr_; // assignment from T_var not allowed @@ -193,7 +193,7 @@ private: // ************************************************************* // ConstructionPolicy // ************************************************************* - + #if ! defined (TAO_HAS_MINIMUM_CORBA) class TAO_Export CORBA_ConstructionPolicy_var @@ -203,14 +203,14 @@ public: CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr); CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &); // copy constructor ~CORBA_ConstructionPolicy_var (void); // destructor - + CORBA_ConstructionPolicy_var &operator= (CORBA_ConstructionPolicy_ptr); CORBA_ConstructionPolicy_var &operator= (const CORBA_ConstructionPolicy_var &); CORBA_ConstructionPolicy_ptr operator-> (void) const; - + operator const CORBA_ConstructionPolicy_ptr &() const; operator CORBA_ConstructionPolicy_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_ConstructionPolicy_ptr in (void) const; CORBA_ConstructionPolicy_ptr &inout (void); CORBA_ConstructionPolicy_ptr &out (void); @@ -233,7 +233,7 @@ public: operator CORBA_ConstructionPolicy_ptr &(); CORBA_ConstructionPolicy_ptr &ptr (void); CORBA_ConstructionPolicy_ptr operator-> (void); - + private: CORBA_ConstructionPolicy_ptr &ptr_; }; @@ -250,33 +250,33 @@ public: static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj); static CORBA_ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = - CORBA::default_environment () + CORBA::Environment &env = + TAO_default_environment () ); static CORBA_ConstructionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = - CORBA::default_environment () + CORBA::Environment &env = + TAO_default_environment () ); static CORBA_ConstructionPolicy_ptr _nil (void); virtual void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = - CORBA::default_environment () + const CORBA::Char *type_id, + CORBA::Environment &env = + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_ConstructionPolicy (void); - CORBA_ConstructionPolicy (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_ConstructionPolicy (TAO_Stub *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_ConstructionPolicy (void); @@ -286,16 +286,16 @@ private: }; // Any operators for interface CORBA_ConstructionPolicy -void TAO_Export operator<<= (CORBA::Any &, +void TAO_Export operator<<= (CORBA::Any &, CORBA_ConstructionPolicy_ptr); -CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_ConstructionPolicy *&); #ifndef __ACE_INLINE__ -CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr ); -CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_ConstructionPolicy_ptr &); #endif /* __ACE_INLINE__ */ @@ -306,28 +306,28 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, // Any operators for interface CORBA_DomainManager -void TAO_Export operator<<= (CORBA::Any &, +void TAO_Export operator<<= (CORBA::Any &, CORBA_DomainManager_ptr); -CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_DomainManager *&); // Any operators for interface CORBA_DomainManagerList -void TAO_Export operator<<= (CORBA::Any &, +void TAO_Export operator<<= (CORBA::Any &, const CORBA_DomainManagerList &); // copying version -void TAO_Export operator<<= (CORBA::Any &, +void TAO_Export operator<<= (CORBA::Any &, CORBA_DomainManagerList*); // noncopying version -CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_DomainManagerList *&); #ifndef __ACE_INLINE__ -CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr ); -CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &); -CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_DomainManagerList &); -CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_DomainManagerList &); #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 24fc8908af0..5a1f5a6b57b 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -284,17 +284,20 @@ public: const char *name, char *buffer, size_t buflen, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Make the TypeCode for a standard exception. When used // correctly, initializing system exceptions is only an exercise // in CPU time; it allocates no new memory. static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Make the TypeCode for the CORBA::UnknownUserException standard // exception. - static void init (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void init (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Runtime initialization of all standard exception typecodes. // Called from <CORBA::ORB_init>. @@ -302,7 +305,7 @@ public: // Runtime finalization of all standard exception typecodes. static CORBA_Exception *create_system_exception (const char* id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Create a CORBA::SystemException given the interface repository // ID. @@ -360,10 +363,10 @@ public: void add_consume (CORBA::TypeCode_ptr tc); // add and consume a TypeCode to the list - CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // return the typecode at index i. Raises the "Bounds" exception - void remove (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + void remove (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // remove the typecode at index i. Raises the "Bounds" exception #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h index df49b095c36..66292552fa1 100644 --- a/TAO/tao/Forwarding_Servant.h +++ b/TAO/tao/Forwarding_Servant.h @@ -37,14 +37,15 @@ public: // Constructor virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp index 08d6433fdc7..5573237bfe3 100644 --- a/TAO/tao/GIOP.cpp +++ b/TAO/tao/GIOP.cpp @@ -126,7 +126,7 @@ TAO_GIOP::dump_msg (const char *label, { const char* message_name = "UNKNOWN MESSAGE"; unsigned long index = ptr[7] + TAO_GIOP::tao_specific_message_types; - if (index >= 0 && index < sizeof (names)/sizeof(names[0])) + if (index < sizeof (names)/sizeof(names[0])) { message_name = names [index]; } @@ -900,7 +900,7 @@ TAO_GIOP::process_server_message (TAO_Transport *transport, CORBA::Boolean response_required = 0; CORBA::ULong request_id = 0; - CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment (); + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (); ACE_TRY { TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END); diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h index 0ef9cb98ec8..863df62d298 100644 --- a/TAO/tao/GIOP.h +++ b/TAO/tao/GIOP.h @@ -265,7 +265,8 @@ public: // Constructor CORBA::Boolean init (TAO_InputCDR &msg, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Initialize the header from the values found in <msg>. CORBA::ULong request_id; diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h index 67570348570..52b182a8c39 100644 --- a/TAO/tao/GIOP_Server_Request.h +++ b/TAO/tao/GIOP_Server_Request.h @@ -35,7 +35,7 @@ public: TAO_OutputCDR &output, TAO_ORB_Core *orb_core, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Constructor TAO_GIOP_ServerRequest (CORBA::ULong &request_id, CORBA::Boolean &response_expected, @@ -44,7 +44,7 @@ public: TAO_OutputCDR &output, TAO_ORB_Core *orb_core, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual ~TAO_GIOP_ServerRequest (void); // Destructor. @@ -54,18 +54,18 @@ public: // = General ServerRequest operations void arguments (CORBA::NVList_ptr &list, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void set_result (const CORBA::Any &value, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void set_exception (const CORBA::Any &value, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // does the marshaling of outgoing parameters and is used by the DSI // based scheme @@ -109,7 +109,7 @@ public: // i.e., by the IDL compiler generated skeletons. virtual void init_reply (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // start a Reply message virtual TAO_InputCDR &incoming (void); diff --git a/TAO/tao/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h index b5436016002..1c350cefb7a 100644 --- a/TAO/tao/IIOP_Connect.h +++ b/TAO/tao/IIOP_Connect.h @@ -130,7 +130,7 @@ public: CORBA::Boolean &response_required, CORBA::ULong &request_id, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Handle processing of the request residing in <msg>, setting // <response_required> to zero if the request is for a oneway or // non-zero if for a two-way and <response> to any necessary @@ -146,7 +146,7 @@ protected: CORBA::Boolean &response_required, CORBA::ULong &request_id, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Handle processing of the location request residing in <msg>, // setting <response_required> to one if no errors are encountered. // The LocateRequestReply is placed into <response>. In case of diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index fcb5ec34e35..68a3e482bc0 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -71,7 +71,7 @@ public: void put_param (CORBA::TypeCode_ptr tc, void *value, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Encodes the value into the undelying CDR stream based on the // TypeCode parameter @@ -82,7 +82,7 @@ protected: void start (CORBA::Boolean is_roundtrip, TAO_GIOP::Message_Type message_type, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Establishes a connection to the remote server, initializes // the GIOP and Request headers in the output CDR. @@ -94,7 +94,7 @@ protected: int invoke (CORBA::Boolean is_roundtrip, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Sends the request, does not wait for the response. // Returns TAO_INVOKE_RESTART if the write call failed and the @@ -109,7 +109,7 @@ protected: int location_forward (TAO_InputCDR &inp_stream, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Helper method, the response for a Request or LocateRequest was a // LOCATION_FORWARD or TAO_GIOP_OBJECT_FORWARD. @@ -190,13 +190,13 @@ public: TAO_ORB_Core* orb_core); void start (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Calls TAO_GIOP_Invocation::start. int invoke (CORBA::ExceptionList &exceptions, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException)); // Send request, block until any reply comes back, and unmarshal // reply parameters as appropriate. @@ -204,7 +204,7 @@ public: int invoke (TAO_Exception_Data *excepts, CORBA::ULong except_count, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::Exception)); // Special purpose invoke method used by the interpretive stubs. This // accomplishes the same task as the normal invoke except that @@ -214,7 +214,7 @@ public: void get_value (CORBA::TypeCode_ptr tc, void *value, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // No CORBA::Context support (deprecated). TAO_InputCDR &inp_stream (void); @@ -246,12 +246,12 @@ public: TAO_ORB_Core* orb_core); void start (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Call TAO_GIOP_Invocation::start() int invoke (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Send request, without blocking for any response. }; @@ -268,12 +268,12 @@ public: TAO_ORB_Core* orb_core); void start (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Calls TAO_GIOP_Invocation::start. int invoke (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Send request, without blocking for any response. diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index 469df69bf6b..a99873292a1 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -32,13 +32,13 @@ CORBA::TypeCode::traverse_status DEEP_COPY (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); CORBA::TypeCode::traverse_status DEEP_FREE (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // = Forward declarations. class TAO_Marshal_Object; @@ -70,7 +70,7 @@ public: // destructor virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Factory method that returns the appropriate marshal object. private: @@ -115,25 +115,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // encoding operation virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // decoding operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // append operation TAO_Marshal_Object (void); @@ -158,25 +158,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -196,25 +196,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *source, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -234,25 +234,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -272,25 +272,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -310,25 +310,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -348,25 +348,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -386,25 +386,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -424,25 +424,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -462,25 +462,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -500,25 +500,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -538,25 +538,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -575,25 +575,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; @@ -612,25 +612,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // append operation }; diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index b9670211912..a3b03007d15 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -46,7 +46,7 @@ public: PortableServer::POA_ptr poa, const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Helper method for the implementation of CORBA::ORB::create_policy @@ -56,16 +56,16 @@ public: CORBA::Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr _default_POA ( - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 9f410e58b57..dfb7dd3e040 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -179,38 +179,38 @@ public: // return the current number of elements in the list CORBA_NamedValue_ptr add (CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // add an element and just initialize the flags CORBA_NamedValue_ptr add_item (const char *, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // add an element and initialize its name and flags CORBA_NamedValue_ptr add_value (const char *, const CORBA::Any &, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // initializes a value, name, and flags CORBA_NamedValue_ptr add_item_consume (char *, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // just like add_item. In addition, memory management of char * name is taken // over by the NVList CORBA_NamedValue_ptr add_value_consume (char *, CORBA::Any_ptr, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // just like add_value. In addition, the NVList controls the memory // management of the char *name and Any *value parameter - CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // retrieve the item at the nth location. Raises Bounds // CORBA::Status - void remove (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + void remove (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // remove element at index n. Raises Bounds // The pseudo object static methods.. @@ -232,7 +232,7 @@ private: // constructor - cannot be instantiated directly other than through the // ORB::create_list method - CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // helper to increase the list size. This is used by all the add_ methods of // the NVList class diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 45fff7d5b90..fecac3e10bd 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1251,7 +1251,7 @@ CORBA::ORB_init (int &argc, const char * orb_name) { return CORBA::ORB_init (argc, argv, orb_name, - CORBA::default_environment ()); + TAO_default_environment ()); } CORBA::ORB_ptr diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index b07f175d7b7..4d9f4152d6a 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -370,7 +370,7 @@ public: virtual CORBA::Object_ptr string_to_object ( const char *str, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Turn a string-ified object reference back into an object pointer. // Typically these strings are created using <object_to_string()>, // but not necessarily locally. @@ -378,7 +378,7 @@ public: virtual CORBA::String object_to_string ( CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Turn an object reference into a string. Each type of ORB, // e.g. an IIOP ORB, must implement this. This can be used by // servers to publish their whereabouts to clients. The output of @@ -392,12 +392,12 @@ public: const char *repository_id, CORBA::ValueFactory_ptr factory, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment () ); + TAO_default_environment () ); void unregister_value_factory (const char * repository_id, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment () ); + TAO_default_environment () ); CORBA::ValueFactory_ptr lookup_value_factory (const char *repository_id, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () ); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* TAO_HAS_VALUETYPE */ #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -413,50 +413,50 @@ public: void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // The following are not implemented and just throw // CORBA::NO_IMPLEMENT. void create_named_value (CORBA::NamedValue_ptr &nmval, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void create_exception_list (CORBA::ExceptionList_ptr &exclist, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void create_context_list (CORBA::ContextList_ptr &ctxtlist, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void get_default_context (CORBA::Context_ptr &ctx, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void create_environment (CORBA::Environment_ptr &new_env, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); CORBA::Boolean get_service_information (CORBA::ServiceType service_type, CORBA::ServiceInformation_out service_information, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq req, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq req, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); void get_next_response (CORBA_Request_ptr &req, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // = New Things from the POA Specification // @@ -515,7 +515,7 @@ public: // is returned. void shutdown (CORBA::Boolean wait_for_completion = 0, - CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // This operation instructs the ORB to shut down. Shutting down the // ORB causes all Object Adapters to be shut down. If // <wait_for_completion> parameter is TRUE, this operation blocks @@ -528,12 +528,12 @@ public: CORBA_Object_ptr resolve_initial_references (const char *name, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); CORBA_Object_ptr resolve_initial_references (const char *name, ACE_Time_Value *timeout, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // This method acts as a mini-bootstrapping Naming Service, which is // provided by the ORB for certain well-known object references. // TAO supports the "NameService", "TradingService", "RootPOA", and @@ -549,13 +549,13 @@ public: // Unimplemented function - throws CORBA::NO_IMPLEMENT. CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); #if defined(TAO_HAS_CORBA_MESSAGING) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any& val, CORBA_Environment &ACE_TRY_ENV = - CORBA::default_environment ()) + TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -585,13 +585,13 @@ public: TAO_Stub *create_stub_object (const TAO_ObjectKey &key, const char *type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Makes sure that the ORB is open and then creates an IIOP object // based on the endpoint. CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Convert key into an object reference. Return Object_ptr as out // parameter. Errors will come through the environment. // @@ -615,7 +615,7 @@ public: // previously-specified port for requests. Returns -1 on failure, // else 0. - static void init_orb_globals (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void init_orb_globals (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Initialize the ORB globals correctly, i.e., only when they // haven't been initialized yet. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 8fa6fa59e15..c09b234a640 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -32,8 +32,8 @@ typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX> // **************************************************************** -CORBA_Environment& -CORBA::default_environment () +CORBA::Environment& +TAO_default_environment () { // @@ This is a slight violation of layering, we should use // TAO_ORB_Core_instance(), but that breaks during startup. diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index dea6e0d04e8..1e14adcd7b1 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -108,7 +108,7 @@ public: TAO_POA *root_poa (const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); - PortableServer::POA_ptr root_poa_reference (CORBA::Environment &TAO_IN_ENV = CORBA::default_environment (), + PortableServer::POA_ptr root_poa_reference (CORBA::Environment &TAO_IN_ENV = TAO_default_environment (), const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); @@ -248,7 +248,7 @@ public: CORBA::Policy_ptr get_default_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Accesor to obtain the default policy for a particular policy // type. // If there is no default policy it returns CORBA::Policy::_nil () diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index ba5501bc2ca..5156e481168 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -44,7 +44,7 @@ public: static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // no-op it is just here to simplify some templates. // These calls correspond to over-the-wire operations, or at least @@ -55,7 +55,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // determine if we are of the type specified by the "logical_type_id" virtual const char* _interface_repository_id (void) const; @@ -71,16 +71,16 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual CORBA::ImplementationDef_ptr _get_implementation (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // This method is deprecated in the CORBA 2.2 spec, we just return 0 // every time. virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Interface repository related operations. @@ -97,7 +97,7 @@ public: CORBA::Request_ptr &request, CORBA::Flags req_flags, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual void _create_request (CORBA::Context_ptr ctx, const CORBA::Char *operation, @@ -108,7 +108,7 @@ public: CORBA::Request_ptr &request, CORBA::Flags req_flags, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // The default implementation of this method uses the same simple, // multi-protocol remote invocation interface as is assumed by the @@ -116,7 +116,7 @@ public: virtual CORBA::Request_ptr _request (const CORBA::Char *operation, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // DII operation to create a request. #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -125,34 +125,34 @@ public: CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::Policy_ptr _get_client_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::PolicyList * _get_policy_overrides ( const CORBA::PolicyTypeSeq & types, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::Boolean _validate_connection ( CORBA::PolicyList_out inconsistent_policies, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); #endif /* TAO_HAS_CORBA_MESSAGING */ virtual CORBA::ULong _hash (CORBA::ULong maximum, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Return a (potentially non-unique) hash value for this object. // This method relies on the representation of the object // reference's private state. Since that changes easily (when @@ -161,14 +161,14 @@ public: virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Try to determine if this object is the same as <other_obj>. This // method relies on the representation of the object reference's // private state. Since that changes easily (when different ORB // protocols are in use) there is no default implementation. virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Return the object key as an out parameter. Caller should release // return value when finished with it. @@ -293,7 +293,7 @@ public: virtual void _downcast (CORBA_Object* base_ptr, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) = 0; + TAO_default_environment ()) = 0; virtual CORBA_Object* _upcast (void) = 0; virtual void _release (void) = 0; }; diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index 30cd5a800d7..99a0aff90ee 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -76,15 +76,15 @@ public: TAO_Thread_Policy (const TAO_Thread_Policy &new_policy); - PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::ThreadPolicyValue value_; @@ -103,15 +103,15 @@ public: TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs); - PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::LifespanPolicyValue value_; @@ -128,15 +128,15 @@ public: TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs); - PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::IdUniquenessPolicyValue value_; @@ -153,15 +153,15 @@ public: TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs); - PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::IdAssignmentPolicyValue value_; @@ -180,15 +180,15 @@ public: TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs); - PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::ImplicitActivationPolicyValue value_; @@ -205,15 +205,15 @@ public: TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs); - PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::ServantRetentionPolicyValue value_; @@ -230,15 +230,15 @@ public: TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs); - PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); protected: PortableServer::RequestProcessingPolicyValue value_; @@ -376,109 +376,109 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* TAO_HAS_MINIMUM_CORBA */ PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* TAO_HAS_MINIMUM_CORBA */ - CORBA::String the_name (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::String the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) - PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void set_servant_manager (PortableServer::ServantManager_ptr imgr, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void set_servant (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* TAO_HAS_MINIMUM_CORBA */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void deactivate_object (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA::Object_ptr create_reference (const char *intf, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) void forward_object (const PortableServer::ObjectId &oid, CORBA::Object_ptr forward_to, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index ee4be9991f6..52e84359553 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -339,15 +339,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj); - static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ThreadPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ThreadPolicy (TAO_Stub *objref = 0, @@ -448,15 +448,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj); - static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static LifespanPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: LifespanPolicy ( @@ -557,15 +557,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj); - static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static IdUniquenessPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: IdUniquenessPolicy ( @@ -666,15 +666,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj); - static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static IdAssignmentPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: IdAssignmentPolicy ( @@ -778,15 +778,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj); - static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ImplicitActivationPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ImplicitActivationPolicy ( @@ -892,15 +892,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj); - static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ServantRetentionPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ServantRetentionPolicy ( @@ -1007,15 +1007,15 @@ TAO_NAMESPACE PortableServer{ // the static operations static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj); - static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static RequestProcessingPolicy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #else - virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: RequestProcessingPolicy ( @@ -1116,7 +1116,7 @@ TAO_NAMESPACE PortableServer{ // the static operations static POAManager_ptr _duplicate (POAManager_ptr obj); - static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static POAManager_ptr _nil (void); @@ -1152,18 +1152,18 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ - virtual void activate (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual State get_state (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: POAManager ( @@ -1257,11 +1257,11 @@ TAO_NAMESPACE PortableServer{ // the static operations static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); - static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static AdapterActivator_ptr _nil (void); - virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: AdapterActivator ( @@ -1355,10 +1355,10 @@ TAO_NAMESPACE PortableServer{ // the static operations static ServantManager_ptr _duplicate (ServantManager_ptr obj); - static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ServantManager_ptr _nil (void); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ServantManager ( @@ -1451,12 +1451,12 @@ TAO_NAMESPACE PortableServer{ // the static operations static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); - static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ServantActivator_ptr _nil (void); - virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ServantActivator ( @@ -1552,12 +1552,12 @@ TAO_NAMESPACE PortableServer{ // the static operations static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); - static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static ServantLocator_ptr _nil (void); - virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: ServantLocator ( @@ -1651,7 +1651,7 @@ TAO_NAMESPACE PortableServer{ // the static operations static POA_ptr _duplicate (POA_ptr obj); - static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static POA_ptr _nil (void); @@ -2071,55 +2071,55 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ - virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual Servant get_servant (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual void deactivate_object (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual Servant id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual void deactivate_object (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual Servant id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: POA ( @@ -2212,7 +2212,7 @@ TAO_NAMESPACE PortableServer{ // the static operations static Current_ptr _duplicate (Current_ptr obj); - static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static Current_ptr _nil (void); @@ -2253,9 +2253,9 @@ TAO_NAMESPACE PortableServer{ #endif /* end #if !defined */ - virtual POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); - virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; protected: Current ( diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h index e485daee709..d00e8d542ae 100644 --- a/TAO/tao/POAManager.h +++ b/TAO/tao/POAManager.h @@ -35,23 +35,23 @@ class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager public: - void activate (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if !defined (TAO_HAS_MINIMUM_CORBA) void hold_requests (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void discard_requests (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* TAO_HAS_MINIMUM_CORBA */ - PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); TAO_POA_Manager (TAO_Object_Adapter &object_adapter); diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index 0652bb63e2d..ff12c1390a8 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -45,33 +45,33 @@ TAO_NAMESPACE POA_PortableServer virtual ~ThreadPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -90,19 +90,19 @@ TAO_NAMESPACE POA_PortableServer ThreadPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ThreadPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: ThreadPolicy_ptr servant_; @@ -123,34 +123,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~LifespanPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -169,19 +169,19 @@ TAO_NAMESPACE POA_PortableServer LifespanPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::LifespanPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -202,34 +202,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~IdUniquenessPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -248,19 +248,19 @@ TAO_NAMESPACE POA_PortableServer IdUniquenessPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::IdUniquenessPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -281,34 +281,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~IdAssignmentPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -327,19 +327,19 @@ TAO_NAMESPACE POA_PortableServer IdAssignmentPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::IdAssignmentPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -362,34 +362,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~ImplicitActivationPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -408,19 +408,19 @@ TAO_NAMESPACE POA_PortableServer ImplicitActivationPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ImplicitActivationPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -441,34 +441,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantRetentionPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -487,19 +487,19 @@ TAO_NAMESPACE POA_PortableServer ServantRetentionPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ServantRetentionPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -520,34 +520,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~RequestProcessingPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -566,19 +566,19 @@ TAO_NAMESPACE POA_PortableServer RequestProcessingPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::RequestProcessingPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -601,27 +601,27 @@ TAO_NAMESPACE POA_PortableServer virtual ~POAManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual void activate ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void activate ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -639,31 +639,31 @@ TAO_NAMESPACE POA_PortableServer POAManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void activate ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual void hold_requests ( CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void discard_requests ( CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void deactivate ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); private: POAManager_ptr servant_; @@ -685,15 +685,15 @@ TAO_NAMESPACE POA_PortableServer virtual ~AdapterActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -711,12 +711,12 @@ TAO_NAMESPACE POA_PortableServer AdapterActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char* name, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -737,14 +737,14 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -762,7 +762,7 @@ TAO_NAMESPACE POA_PortableServer ServantManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -783,17 +783,17 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -812,12 +812,12 @@ TAO_NAMESPACE POA_PortableServer ServantActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void etherealize ( const PortableServer::ObjectId & oid, @@ -825,7 +825,7 @@ TAO_NAMESPACE POA_PortableServer PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -846,7 +846,7 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantLocator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); @@ -854,13 +854,13 @@ TAO_NAMESPACE POA_PortableServer PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -879,14 +879,14 @@ TAO_NAMESPACE POA_PortableServer ServantLocator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::Servant preinvoke ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void postinvoke ( const PortableServer::ObjectId & oid, @@ -894,7 +894,7 @@ TAO_NAMESPACE POA_PortableServer const char * operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -916,85 +916,85 @@ TAO_NAMESPACE POA_PortableServer virtual ~POA (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual char * the_name (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; - virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant get_servant ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant get_servant ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void set_servant (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void set_servant (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1012,142 +1012,142 @@ TAO_NAMESPACE POA_PortableServer POA_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr find_POA ( const char* adapter_name, CORBA::Boolean activate_it, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual char* the_name ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr the_parent ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::POAManager_ptr the_POAManager ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::AdapterActivator_ptr the_activator ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void the_activator (PortableServer::AdapterActivator_ptr _tao_value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ServantManager_ptr get_servant_manager ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::Servant get_servant ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void set_servant ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual PortableServer::ObjectId * activate_object ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void activate_object_with_id ( const PortableServer::ObjectId & id, PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void deactivate_object ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr create_reference ( const char *intf, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, const char *intf, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * servant_to_id ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * reference_to_id ( CORBA::Object_ptr reference, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -1168,17 +1168,17 @@ TAO_NAMESPACE POA_PortableServer virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr get_POA ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr get_POA ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1197,13 +1197,13 @@ TAO_NAMESPACE POA_PortableServer Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr get_POA ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * get_object_id ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index 5572d879cf1..df2a799b910 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -57,14 +57,14 @@ public: virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); - ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -84,7 +84,7 @@ public: Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -105,22 +105,22 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ) = 0; virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ) = 0; virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -128,21 +128,21 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); static void copy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); static void destroy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); static void _is_a_skel ( @@ -150,7 +150,7 @@ public: void *obj, void *context, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); static void _non_existent_skel ( @@ -166,12 +166,12 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA_Policy_ptr _this ( CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -191,16 +191,16 @@ public: Policy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment () + CORBA_Environment &TAO_IN_ENV = TAO_default_environment () ); private: @@ -353,8 +353,8 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual void* _downcast ( @@ -365,42 +365,42 @@ public: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); static void _non_existent_skel ( CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); CORBA::DomainManager *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; virtual CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ) = 0; static void get_domain_policy_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &_tao_env = - CORBA::default_environment () + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &_tao_env = + TAO_default_environment () ); }; @@ -415,10 +415,10 @@ public: DomainManager_ptr _get_servant (void) const; virtual CORBA::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); - + private: DomainManager_ptr servant_; }; @@ -1756,8 +1756,8 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual void* _downcast ( @@ -1768,43 +1768,43 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); static void _non_existent_skel ( CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); CORBA::ConstructionPolicy *_this ( - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; virtual void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ) = 0; static void make_domain_manager_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &_tao_env = - CORBA::default_environment () + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &_tao_env = + TAO_default_environment () ); }; @@ -1821,15 +1821,15 @@ private: virtual void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( const char *logical_type_id, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); - + private: ConstructionPolicy_ptr servant_; }; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index e95015a5d94..78ed8438b98 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -140,31 +140,31 @@ public: static CORBA_Policy_ptr _narrow ( CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_Policy_ptr _nil (void); virtual CORBA::PolicyType policy_type ( CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA_Policy_ptr copy ( CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual void destroy ( CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: @@ -381,30 +381,30 @@ public: static CORBA_PolicyManager_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PolicyManager_ptr _nil (void); virtual CORBA_PolicyList * get_policy_overrides ( const CORBA_PolicyTypeSeq & ts, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual void set_policy_overrides ( const CORBA_PolicyList & policies, CORBA::SetOverrideType set_add, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: @@ -476,19 +476,19 @@ public: static CORBA_PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PolicyCurrent_ptr _nil (void); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index b38d013d159..6bbe24b1ac9 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -49,7 +49,7 @@ public: const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Modify the list of policies to include <policies>. // If <set_add> is CORBA::SET_OVERRIDE then we replace all the old @@ -60,7 +60,7 @@ public: CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & types, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Get the values (if any) for the policies in <types>, if <types> // is an empty list the method returns *all* the current policies. @@ -68,7 +68,7 @@ public: CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Obtain a single policy. @@ -101,7 +101,7 @@ public: CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Obtain a single policy. @@ -134,7 +134,7 @@ public: CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Obtain a single policy. @@ -167,7 +167,7 @@ public: CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); // Obtain a single policy. diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index de98961c6e9..135728c5266 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -141,28 +141,28 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object static CORBA_Pollable_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_Pollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_Pollable_ptr _nil (void); virtual CORBA::Boolean is_ready ( CORBA::ULong timeout, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA_PollableSet_ptr create_pollable_set ( CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: @@ -235,19 +235,19 @@ public: static CORBA_DIIPollable_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_DIIPollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_DIIPollable_ptr _nil (void); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: @@ -275,12 +275,12 @@ public: static CORBA_PollableSet_ptr _narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PollableSet_ptr _unchecked_narrow ( CORBA::Object_ptr obj, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); static CORBA_PollableSet_ptr _nil (void); @@ -349,31 +349,31 @@ public: virtual CORBA_DIIPollable_ptr create_dii_pollable ( CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual void add_pollable ( CORBA_Pollable_ptr potential, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA_Pollable_ptr poll ( CORBA::ULong timeout, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual void remove ( CORBA_Pollable_ptr potential, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA::UShort number_left ( CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, CORBA::Environment &env = - CORBA::default_environment () + TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index 309069f30c4..3adf86ba587 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -137,12 +137,12 @@ private: CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); CORBA_Request (CORBA::Object_ptr obj, const CORBA::Char *op, CORBA::Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); ~CORBA_Request (void); @@ -261,7 +261,7 @@ public: // Implement the same constructors provided by the template here, // check Sequence_T.h for ideas. // Simply delegate on the template for the implementation... - + CORBA_ORB_RequestSeq (void); // default ctor @@ -281,14 +281,14 @@ public: // dtor releases all the contained elements. }; -// This class definition should be removed.. But need to +// This class definition should be removed.. But need to // check with all the compiler guys before we have this removed /*class CORBA_ORB_RequestSeq : public TAO_Unbounded_Base_Sequence { public: - + // Default constructor. CORBA_ORB_RequestSeq (void); diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 747e4373283..b94f14e6513 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -63,7 +63,8 @@ public: virtual void _downcast (void *target, CORBA_Object *src, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Used for sequences of objects to downcast a recently demarshalled // object reference into the right type. diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index e17df789920..918160ab25f 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -429,8 +429,8 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src, - CORBA_Environment &ACE_TRY_ENV - /* = CORBA::default_environment () */); + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); // No default to workaround egcs problem with templates and // namespaces virtual CORBA_Object* _upcast (void* src) const; @@ -488,8 +488,8 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src, - CORBA_Environment &ACE_TRY_ENV - /* = CORBA::default_environment () */); + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); // No default to workaround egcs problem with templates and // namespaces virtual CORBA_Object* _upcast (void* src) const; diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index 5ea5fbfa0b7..03b2f6ee396 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -40,24 +40,24 @@ public: virtual ~TAO_ServantBase (void); // Destructor. - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Returns the default POA for this servant. virtual CORBA::Boolean _is_a (const char* logical_type_id, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Default <_non_existent>: always returns false. // = Reference counting hooks: no-ops by default. - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // This is an auxiliar method for _this() and _narrow(). protected: @@ -72,7 +72,7 @@ protected: virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // Dispatches a request to the object: find the operation, cast the // type to the most derived type, demarshall all the parameters from // the request and finally invokes the operation, storing the @@ -148,10 +148,10 @@ public: ~TAO_RefCountServantBase (void); // Destructor. - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Increase reference count by one. - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Decreases reference count by one; if the resulting reference // count equals zero, _remove_ref invokes delete on its this pointer // in order to destroy the servant. @@ -226,7 +226,7 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase // = TITLE // Base class for local skeletons and servants. protected: - TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA }; @@ -245,19 +245,19 @@ class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase // circumstances may lead to unpredictable results. public: virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Returns a CORBA::Object_ptr for the target object. protected: @@ -268,12 +268,12 @@ protected: virtual void *_downcast (const char *repository_id); // Simply returns "this" - virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Turns around and calls invoke. }; diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index b17e9cabc57..577e2c4e9af 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -113,13 +113,13 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) virtual void arguments (CORBA::NVList_ptr &list, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the ORB with the operation's // parameter list ... on return, their values are available; the // list fed in has typecodes and (perhap) memory assigned. virtual void set_result (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the operation result // ... illegal if exception() was called or params() was not called. // @@ -127,7 +127,7 @@ public: // sent when this returns, and reclaim memory it allocated. virtual void set_exception (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the exception value which is // the only result of this particular invocation. // @@ -143,7 +143,7 @@ public: // this stuff is a catastrophic error since this is all part of the // basic CORBA Object Model. - virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // marshal outgoing parameters. Used by DSI #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -154,7 +154,7 @@ public: virtual unsigned int operation_length (void) const = 0; // get the length of the operation name - virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual void init_reply (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // Start a Reply message. // CORBA::Context_ptr ctx (void) = 0; diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index eff3fefcaac..2169bd7e36c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -245,7 +245,7 @@ public: CORBA::Flags flags, CORBA::ExceptionList &exceptions, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Dynamic invocations use a more costly "varargs" calling // convention; it's got the same input data as the (static) // stub-oriented one, but the data is represented somewhat @@ -270,7 +270,7 @@ public: CORBA::Policy_ptr get_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); POA_Messaging::RelativeRoundtripTimeoutPolicy* @@ -279,23 +279,23 @@ public: CORBA::Policy_ptr get_client_policy ( CORBA::PolicyType type, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); TAO_Stub* set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & types, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); CORBA::Boolean validate_connection ( CORBA::PolicyList_out inconsistent_policies, CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment () + TAO_default_environment () ); #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -303,7 +303,7 @@ public: // All objref representations carry around a type ID. CORBA::ULong hash (CORBA::ULong maximum, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // All objref representations know how to hash themselves and // compare themselves for equivalence to others. It's easily // possible to have two objrefs that are distinct copies of data @@ -312,7 +312,7 @@ public: CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Implement the is_equivalent() method for the CORBA::Object // Our Constructors ... @@ -405,7 +405,7 @@ protected: void put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Helper method to factor out common code in dynamic oneway // vs. twoway invocations. diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index da40929be65..bf06aee10e6 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -46,21 +46,21 @@ public: int init (int &argc, char *argv[], - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Initialize the ORB/root POA, using the supplied command line // arguments or the default ORB components. Returns -1 on failure. int init (int &argc, char *argv[], const char *orb_name, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Initialize the ORB/root POA, using the supplied command line // arguments or the default ORB components. Returns -1 on failure. int init_child_poa (int &argc, char *argv[], const char *poa_name, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Creates a child poa under the root poa with PERSISTENT and // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. @@ -69,13 +69,13 @@ public: char *argv[], const char *poa_name, const char *orb_name, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Creates a child poa under the root poa with PERSISTENT and // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. int activate_poa_manager (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + TAO_default_environment ()); // Put POA manager into the <Active> state, so that incoming corba // requests are processed. This method is useful for clients, // which are not going to enter "orb->run" loop, yet may want to @@ -83,32 +83,32 @@ public: // call on a server. Returns -1 on failure. CORBA::String activate (PortableServer::Servant servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Activate <servant>, using the POA <activate_object> call. Users // can call this method multiple times to activate multiple objects. // Returns 0 on failure. void deactivate (const char *id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Deactivate object in RootPOA. CORBA::String activate_under_child_poa (const char *servant_name, PortableServer::Servant servant, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Precondition: init_child_poa has been called. Activate <servant> // using the POA <activate_object_with_id> created from the string // servant_name. Users should call this to activate objects under // the child_poa. void deactivate_under_child_poa (const char *id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Deactivate object in child POA. int run (CORBA_Environment &TAO_IN_ENV, ACE_Time_Value *tv); int run (ACE_Time_Value &tv, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - int run (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + int run (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Run the ORB event loop with the specified <tv> time value Returns // -1 on failure. diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 9544a4cefb8..d31c2f5f657 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -91,70 +91,70 @@ public: // Returns a NULL typecode. CORBA::Boolean equal (const CORBA::TypeCode_ptr, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Compares two typecodes. CORBA::Boolean equivalent (CORBA::TypeCode_ptr, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Unaliases receiver and argument before comparing. - CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // For all TypeCode kinds, returns the "kind" of the typecode. - const char *id (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + const char *id (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *name (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + const char *name (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns name (), raises (BadKind). - CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. const char *member_name (CORBA::ULong index, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns member_name (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr member_type (CORBA::ULong index, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except. CORBA::Any_ptr member_label (CORBA::ULong n, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns the discriminator type for tk_union. raises (BadKind). - CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns the default index for the tk_union. Raises (BadKind). - CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array. - CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias. - CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Calculates the padded size of discriminant type TAO Extension. // = Creation/refcounting @@ -197,12 +197,12 @@ public: }; // these are used to indicate the status of marshaling - size_t size (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + size_t size (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t alignment (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + size_t alignment (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // returns the alignment requirements for this typecode. // used by the IIOP marshaling engine. @@ -218,13 +218,13 @@ public: // throw CORBA::NO_IMPLEMENT. CORBA::Any_ptr parameter (const CORBA::Long index, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Deprecated in the CORBA 2.2 spec and // missing altogether from 2.3a (98-12-04), - CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Deprecated, CORBA 1.2, not fully usable. Returns the number of // parameters that the typecode takes. @@ -276,122 +276,122 @@ private: // = All the private/helper methods CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // Compares the typecodes. - const char *private_id (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + const char *private_id (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *private_name (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + const char *private_name (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns name (), raises (BadKind) - CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr private_member_type (CORBA::ULong index, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except const char *private_member_name (CORBA::ULong index, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union, // tk_struct, tk_except, and tk_enum CORBA::Any_ptr private_member_label (CORBA::ULong n, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns the discriminator type for tk_union. raises (BadKind); - CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns the default index for the tk_union. Raises (BadKind); - CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array - CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias - size_t private_size (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + size_t private_size (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t private_alignment (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + size_t private_alignment (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // returns the alignment requirements for this typecode. used by the // IIOP marshaling engine. - CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()); + CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Calculates the padded size of discriminant type TAO Extension // = All the private helpers testing for equality of typecodes CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of objrefs CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of structs CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of unions CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of enums CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of strings CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of wide strings CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of sequences CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of array CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of typedefs CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = - CORBA::default_environment ()) const; + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()) const; // test equality for typecodes of exceptions CORBA::ULong refcount_; diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h index 2ae859bb701..9ad1e00daf0 100644 --- a/TAO/tao/UIOP_Connect.h +++ b/TAO/tao/UIOP_Connect.h @@ -132,7 +132,8 @@ public: TAO_OutputCDR &response, CORBA::Boolean &response_required, CORBA::ULong &request_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Handle processing of the request residing in <msg>, setting // <response_required> to zero if the request is for a oneway or // non-zero if for a two-way and <response> to any necessary @@ -149,7 +150,8 @@ protected: TAO_OutputCDR &response, CORBA::Boolean &response_required, CORBA::ULong &request_id, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + TAO_default_environment ()); // Handle processing of the location request residing in <msg>, // setting <response_required> to one if no errors are encountered. // The LocateRequestReply is placed into <response>. In case of diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index c15dd520a46..3cc86c4d5c7 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -350,6 +350,11 @@ typedef void (*TAO_Skeleton)( template <class T> class TAO_Unbounded_Sequence; template <class T> class TAO_Unbounded_Object_Sequence; +// Provide a simple function to access the TSS default environment. +// We tried with CORBA_Environment::default_environment (), +// CORBA::default_environment() and others. +extern TAO_Export CORBA_Environment& TAO_default_environment (void); + TAO_NAMESPACE CORBA { // = TITLE @@ -888,6 +893,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS CORBA_Environment& default_environment (void); // Obtain the thread-specific default environment. + // This is obsolete and only left here for backwards compatibility. }; // end of class (namespace) CORBA diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i index d46b76f6139..6f955350c06 100644 --- a/TAO/tao/corbafwd.i +++ b/TAO/tao/corbafwd.i @@ -53,3 +53,12 @@ CORBA::wstring_dup (const WChar *const str) CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str)); return ACE_OS::wscpy (retval, str); } + +// **************************************************************** + +ACE_INLINE CORBA_Environment& +CORBA::default_environment () +{ + return TAO_default_environment (); +} + diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h index 87a996f0c3d..16ed5d2af77 100644 --- a/TAO/tao/varout.h +++ b/TAO/tao/varout.h @@ -84,8 +84,8 @@ public: // TAO extension for access to the underlying pointer. virtual void _downcast (CORBA_Object *base_ptr, - CORBA_Environment &ACE_TRY_ENV - /* = CORBA::default_environment () */); + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); // No default to workaround egcs problem with templates and // namespaces virtual CORBA_Object *_upcast (void); |