diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-03 06:00:45 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-03 06:00:45 +0000 |
| commit | 4cc66bca1246335c8bc53595499d3ca4301f7b37 (patch) | |
| tree | a2a5cd600c2ee1eeb991f4a4854115ebfb70916c | |
| parent | 36fb06ddece99a6208807c8c3a3f48daedac91f8 (diff) | |
| download | ATCD-4cc66bca1246335c8bc53595499d3ca4301f7b37.tar.gz | |
ChangeLogTag:Thu Sep 2 22:21:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
190 files changed, 5446 insertions, 4995 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a51cc626e28..d8df77fac0d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,249 @@ +Thu Sep 2 22:21:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Exception.h: + * tao/Exception.i: + * tao/Exception.cpp: + + Moved CORBA::SystemException and CORBA::UserException related + code to separate files to improve compile times. + + (Exception): + + Improved exception safety by making "id_" and "name_" attributes + CORBA::String_vars instead of "char *"s. + + * tao/SystemException.h: + * tao/SystemException.inl: + * tao/SystemException.cpp: + + Moved CORBA::SystemException class and related code to this set + of files to improve compile-times of sources that don't need the + declarations and definitions now in these files. + + (SystemException): + + Fixed problem where SystemException attributes were not + initialized in the default constructor, as required by the C++ + mapping. + + * tao/UserException.h: + * tao/UserException.inl: + * tao/UserException.cpp: + + Moved CORBA::SystemException class and related code to this set + of files. This was done mostly for the sake of consistency + since this is not an expensive set of sources in terms of + compile times and footprint. + + * tao/Acceptor_Registry.cpp: + * tao/Adapter.cpp: + * tao/Adapter.h: + * tao/Any_Basic_Impl.cpp: + * tao/Any_Dual_Impl_T.cpp: + * tao/Any_Impl.cpp: + * tao/Any_Impl_T.cpp: + * tao/Any_SystemException.cpp: + * tao/Any_Unknown_IDL_Type.cpp: + * tao/BiDir_Adapter.h: + * tao/BoundsC.cpp: + * tao/Buffering_Constraint_Policy.cpp: + * tao/CDR.cpp: + * tao/CDR_Encaps_Codec.cpp: + * tao/CORBALOC_Parser.cpp: + * tao/CORBANAME_Parser.cpp: + * tao/ClientRequestInfo.inl: + * tao/ClientRequestInfo_i.inl: + * tao/CodecFactory.cpp: + * tao/CodecFactory_ORBInitializer.cpp: + * tao/Codeset_Manager.cpp: + * tao/Connector_Registry.cpp: + * tao/DLL_Parser.cpp: + * tao/Default_Stub_Factory.cpp: + * tao/Environment.cpp: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Generator_Parser.h: + * tao/GIOP_Message_Generator_Parser_10.cpp: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Profile.cpp: + * tao/IORInterceptor_Adapter.h: + * tao/IORInterceptor_Adapter_Factory.h: + * tao/IOR_Parser.h: + * tao/Interceptor_List.cpp: + * tao/Invocation_Base.cpp: + * tao/Invocation_Endpoint_Selectors.cpp: + * tao/LocalObject.cpp: + * tao/MProfile.cpp: + * tao/NVList.cpp: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORBInitializer_Registry.cpp: + * tao/Object_Loader.h: + * tao/Object_Ref_Table.cpp: + * tao/Object_T.cpp: + * tao/PICurrent.cpp: + * tao/PICurrent_ORBInitializer.cpp: + * tao/PolicyFactory_Registry.cpp: + * tao/Policy_ForwardA.cpp: + * tao/Policy_Set.cpp: + * tao/PollableC.cpp: + * tao/Profile.cpp: + * tao/Profile_Transport_Resolver.cpp: + * tao/Profile_Transport_Resolver.h: + * tao/Remote_Object_Proxy_Broker.cpp: + * tao/RequestInfo_Util.cpp: + * tao/Request_Dispatcher.h: + * tao/Service_Callbacks.cpp: + * tao/Services_Activate.h: + * tao/Stub.cpp: + * tao/Synch_Invocation.cpp: + * tao/Synch_Invocation.h: + * tao/TAO_Server_Request.cpp: + * tao/Thread_Lane_Resources.cpp: + * tao/Transport_Connector.cpp: + * tao/TypeCodeFactory_Adapter.h: + * tao/Typecode_Constants.cpp: + * tao/WrongTransactionA.cpp: + * tao/WrongTransactionC.cpp: + * tao/append.cpp: + * tao/corba.h: + * tao/operation_details.cpp: + * tao/operation_details.h: + * tao/skip.cpp: + * tao/Messaging/AMH_Response_Handler.cpp: + * tao/PortableServer/Object_Adapter.i: + * tao/PortableServer/POAManager.i: + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp: + + Include "tao/SystemException.h" and/or "tao/UserException.h" to + pull in CORBA::{System,User}Exception class declaration. + + * tao/Array_VarOut_T.h: + * tao/Array_VarOut_T.inl: + * tao/Array_VarOut_T.cpp: + * tao/CurrentC.cpp: + * tao/CurrentC.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/Fixed_Array_Argument_T.cpp: + * tao/IOP_CodecC.cpp: + * tao/IOP_CodecC.h: + * tao/ORBInitInfo.cpp: + * tao/ORBInitInfo.h: + * tao/Object.cpp: + * tao/Object.h: + * tao/Object_Argument_T.cpp: + * tao/Objref_VarOut_T.cpp: + * tao/Objref_VarOut_T.h: + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/Policy_ForwardC.cpp: + * tao/Policy_ForwardC.h: + * tao/PortableInterceptorC.cpp: + * tao/PortableInterceptorC.h: + * tao/Sequence_T.cpp: + * tao/Sequence_T.i: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/Typecode.cpp: + * tao/Typecode.h: + * tao/Var_Array_Argument_T.cpp: + * tao/BiDir_GIOP/BiDirPolicyC.cpp: + * tao/BiDir_GIOP/BiDirPolicyC.h: + * tao/DynamicAny/DynamicAnyC.cpp: + * tao/DynamicAny/DynamicAnyC.h: + * tao/DynamicInterface/Context.cpp: + * tao/DynamicInterface/ExceptionList.cpp: + * tao/DynamicInterface/Unknown_User_Exception.cpp: + * tao/DynamicInterface/Unknown_User_Exception.h: + * tao/IFR_Client/IFR_BaseC.cpp: + * tao/IFR_Client/IFR_BaseC.h: + * tao/IFR_Client/IFR_BasicC.cpp: + * tao/IFR_Client/IFR_BasicC.h: + * tao/IFR_Client/IFR_ComponentsC.cpp: + * tao/IFR_Client/IFR_ComponentsC.h: + * tao/IFR_Client/IFR_ExtendedC.cpp: + * tao/IFR_Client/IFR_ExtendedC.h: + * tao/IORInterceptor/IORInfoC.cpp: + * tao/IORInterceptor/IORInfoC.h: + * tao/IORInterceptor/IORInterceptorC.cpp: + * tao/IORInterceptor/IORInterceptorC.h: + * tao/IORTable/IORTableC.cpp: + * tao/IORTable/IORTableC.h: + * tao/Messaging/AMH_Response_Handler.cpp: + * tao/Messaging/MessagingC.cpp: + * tao/Messaging/MessagingC.h: + * tao/Messaging/Messaging_No_ImplC.cpp: + * tao/Messaging/Messaging_No_ImplC.h: + * tao/Messaging/Messaging_RT_PolicyC.cpp: + * tao/Messaging/Messaging_RT_PolicyC.h: + * tao/Messaging/Messaging_SyncScope_PolicyC.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyC.h: + * tao/Messaging/TAO_ExtC.cpp: + * tao/Messaging/TAO_ExtC.h: + * tao/ObjRefTemplate/Default_ORTC.cpp: + * tao/ObjRefTemplate/Default_ORTC.h: + * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp: + * tao/ObjRefTemplate/ObjectReferenceTemplateC.h: + * tao/PortableServer/ImR_LocatorC.cpp: + * tao/PortableServer/ImR_LocatorC.h: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/PortableServerC.cpp: + * tao/PortableServer/PortableServerC.h: + * tao/RTCORBA/RTCORBAC.cpp: + * tao/RTCORBA/RTCORBAC.h: + * tao/RTScheduling/RTSchedulerC.cpp: + * tao/RTScheduling/RTSchedulerC.h: + * tao/Valuetype/Sequence_T.cpp: + * tao/Valuetype/Sequence_T.inl: + * tao/Valuetype/ValueBase.cpp: + * tao/Valuetype/ValueBase.h: + * tao/Valuetype/ValueFactory.cpp: + * tao/Valuetype/ValueFactory.h: + * tao/Valuetype/Value_VarOut_T.cpp: + * tao/Valuetype/Value_VarOut_T.h: + + Removed "tao_" prefix from methods in the TAO traits templates + used in these sources. It is redundant since the traits + templates are TAO-specific, and in the TAO namespace. + + * tao/ORB_Core.cpp (check_shutdown): + * tao/ORB_Core.i (check_shutdown): + + Uninlined this method so that we can avoid including + "tao/SystemException.h" in the inline source file. + + * tao/tao.mpc: + + Added new SystemException.cpp and UserException.cpp files to the + ORB_Core source list. + + * TAO_IDL/be/be_codegen.cpp: + + Updated conditional Exception.h header include directive to + generate include directives for tao/SystemException.h and + tao/UserException.h instead. This code is still commented out, + as it was previously, and will be enabled once we reduce + included headers in tao/ORB.h. + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_array/array_ci.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + + Removed "tao_" prefix from methods in the TAO traits templates + and their uses generated by TAO_IDL. It is redundant since the + traits templates are TAO-specific, and in the TAO namespace. + Thu Sep 2 14:41:42 2004 Chris Cleeland <cleeland_c@ociweb.com> * tao/Connection_Handler.cpp (handle_input_eh): Updated to be diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 2388b236469..50b9bc634cf 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1380,19 +1380,25 @@ TAO_CodeGen::gen_stub_hdr_includes (void) this->gen_standard_include (this->client_header_, "tao/ORB.h"); - // Not needed at the moment, since Exception.h is pulled in by ORB.h, - // included at the top of the stub header file. May change if ORB.h - // is rearranged to make a lighter include for applications. + // Not needed at the moment, since {System,User}Exception.h are + // pulled in by ORB.h, which is included in the stub header + // file. May change if ORB.h is rearranged to make a lighter include + // for applications. #if 0 // System exception throw spec for every operation may change soon. + this->gen_cond_file_include ( + idl_global->decls_seen_masks.operation_seen_, + "tao/SystemException.h", + this->client_header_ + ); + // For IDL exception, we need full knowledge of CORBA::UserException. this->gen_cond_file_include ( - idl_global->decls_seen_masks.operation_seen_ - | idl_global->decls_seen_masks.exception_seen_, - "tao/Exception.h", + idl_global->decls_seen_masks.exception_seen_, + "tao/UserException.h", this->client_header_ ); -#endif +#endif /* 0 */ this->gen_standard_include (this->client_header_, "tao/Environment.h"); diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index 2ffa66396f2..a0ef398247a 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -195,7 +195,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "," << be_nl << fname << "_slice," << be_nl << fname << "_tag" << be_uidt_nl - << ">::tao_free ("<< be_idt_nl + << ">::free ("<< be_idt_nl << fname << "_slice * _tao_slice" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -210,7 +210,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "," << be_nl << fname << "_slice," << be_nl << fname << "_tag" << be_uidt_nl - << ">::tao_dup (" << be_idt_nl + << ">::dup (" << be_idt_nl << "const " << fname << "_slice * _tao_slice" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -225,7 +225,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "," << be_nl << fname << "_slice," << be_nl << fname << "_tag" << be_uidt_nl - << ">::tao_copy (" << be_idt_nl + << ">::copy (" << be_idt_nl << fname << "_slice * _tao_to," << be_nl << "const " << fname << "_slice * _tao_from" << be_uidt_nl << ")" << be_uidt_nl @@ -241,7 +241,7 @@ int be_visitor_array_ci::visit_array (be_array *node) << fname << "," << be_nl << fname << "_slice," << be_nl << fname << "_tag" << be_uidt_nl - << ">::tao_alloc (void)" << be_uidt_nl + << ">::alloc (void)" << be_uidt_nl << "{" << be_idt_nl << "return " << fname << "_alloc ();" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index 94cc74fa620..cc46761452b 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -68,7 +68,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate (" + << "TAO::Objref_Traits<" << node->name () << ">::duplicate (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -79,7 +79,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "void" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_release (" + << "TAO::Objref_Traits<" << node->name () << ">::release (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -90,7 +90,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)" + << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" << be_nl << "{" << be_idt_nl << "return " << node->name () << "::_nil ();" << be_uidt_nl @@ -99,7 +99,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "CORBA::Boolean" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" + << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index e2b980bd77e..66bf273b6b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -282,7 +282,7 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *node) } else { - *os << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" + *os << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl @@ -362,7 +362,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) *os << parent->name () << "::"; } - *os << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" + *os << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 4366e194bb7..071136f1ee2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -67,7 +67,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate (" + << "TAO::Objref_Traits<" << node->name () << ">::duplicate (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -78,7 +78,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << "void" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_release (" + << "TAO::Objref_Traits<" << node->name () << ">::release (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -89,7 +89,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)" + << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" << be_nl << "{" << be_idt_nl << "return " << node->name () << "::_nil ();" << be_uidt_nl @@ -98,7 +98,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << "CORBA::Boolean" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" + << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 3a35cfdb386..3a27523ade3 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -838,7 +838,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) } else { - *os << "TAO::Objref_Traits<" << bt->name () << ">::tao_marshal (" + *os << "TAO::Objref_Traits<" << bt->name () << ">::marshal (" << be_idt << be_idt_nl << "_tao_sequence[i].in (), strm" << be_uidt_nl << ");" << be_uidt << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 30db4880b9c..d7233422e98 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -116,15 +116,15 @@ be_visitor_traits::visit_interface (be_interface *node) << "struct " << be_global->stub_export_macro () << " Objref_Traits<" << " ::" << node->name () << ">" << be_nl << "{" << be_idt_nl - << "static ::" << node->name () << "_ptr tao_duplicate (" + << "static ::" << node->name () << "_ptr duplicate (" << be_idt << be_idt_nl << "::" << node->name () << "_ptr" << be_uidt_nl << ");" << be_uidt_nl - << "static void tao_release (" << be_idt << be_idt_nl + << "static void release (" << be_idt << be_idt_nl << "::" << node->name () << "_ptr" << be_uidt_nl << ");" << be_uidt_nl - << "static ::" << node->name () << "_ptr tao_nil (void);" << be_nl - << "static CORBA::Boolean tao_marshal (" << be_idt << be_idt_nl + << "static ::" << node->name () << "_ptr nil (void);" << be_nl + << "static CORBA::Boolean marshal (" << be_idt << be_idt_nl << "::" << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl << ");" << be_uidt << be_uidt_nl @@ -191,10 +191,10 @@ be_visitor_traits::visit_valuetype (be_valuetype *node) << "struct " << be_global->stub_export_macro () << " Value_Traits<" << node->name () << ">" << be_nl << "{" << be_idt_nl - << "static void tao_add_ref (" << node->name () << " *);" << be_nl - << "static void tao_remove_ref (" << node->name () << " *);" + << "static void add_ref (" << node->name () << " *);" << be_nl + << "static void remove_ref (" << node->name () << " *);" << be_nl - << "static void tao_release (" << node->name () << " *);" + << "static void release (" << node->name () << " *);" << be_uidt_nl << "};"; @@ -430,20 +430,20 @@ be_visitor_traits::visit_array (be_array *node) << name << "_tag" << be_uidt_nl << ">" << be_uidt_nl << "{" << be_idt_nl - << "static void tao_free (" << be_idt << be_idt_nl + << "static void free (" << be_idt << be_idt_nl << name << "_slice * _tao_slice" << be_uidt_nl << ");" << be_uidt_nl - << "static " << name << "_slice * tao_dup (" + << "static " << name << "_slice * dup (" << be_idt << be_idt_nl << "const " << name << "_slice * _tao_slice" << be_uidt_nl << ");" << be_uidt_nl - << "static void tao_copy (" << be_idt << be_idt_nl + << "static void copy (" << be_idt << be_idt_nl << name << "_slice * _tao_to," << be_nl << "const " << name << "_slice * _tao_from" << be_uidt_nl << ");" << be_uidt_nl - << "static " << name << "_slice * tao_alloc (void);" + << "static " << name << "_slice * alloc (void);" << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 664e9a660f5..f9574060652 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -145,7 +145,7 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node) { case TAO_CodeGen::TAO_CDR_INPUT: *os << fname << " _tao_union_tmp;" << be_nl - << fname << "_forany _tao_union_helper (" + << fname << "_forany _tao_union_helper (" << be_idt << be_idt_nl << "_tao_union_tmp" << be_uidt_nl << ");" << be_uidt_nl @@ -301,7 +301,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node) { if (f->is_abstract ()) { - *os << "(strm << _tao_union." + *os << "(strm << _tao_union." << f->local_name () << " ());"; } else @@ -315,7 +315,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node) else { *os << "result =" << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" + << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << "_tao_union." << f->local_name () << " ()," << be_nl << "strm" << be_uidt_nl @@ -698,7 +698,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node) -1); } } - + // Now generate the CDR stream operators for the sequence as a // union branch. @@ -849,7 +849,7 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node) -1); } } - + // How generate the CDR stream operators for the structure as // a union branch. @@ -945,7 +945,7 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node) -1); } } - + // Now generate the CDR stream operators for the union as // a union branch. @@ -1040,4 +1040,3 @@ be_visitor_union_branch_cdr_op_cs::explicit_default (void) return 0; } - diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index 0a94b45ac15..1b5a9f15141 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -47,7 +47,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch ( ) { TAO_OutStream *os = this->ctx_->stream (); - + *os << be_nl; // This visitor is used when we are generating the copy ctor and @@ -257,15 +257,15 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (" << be_idt << be_idt_nl + *os << "duplicate (" << be_idt << be_idt_nl << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -279,17 +279,17 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node) if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (" << be_idt << be_idt_nl + *os << "duplicate (" << be_idt << be_idt_nl << "u.u_." << ub->local_name () - << "_->ptr ()" << be_uidt_nl + << "_->ptr ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl << "*this" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -354,15 +354,15 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (" << be_idt << be_idt_nl + *os << "duplicate (" << be_idt << be_idt_nl << "u.u_." << ub->local_name () << "_->ptr ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -376,17 +376,17 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd ( if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (" << be_idt << be_idt_nl + *os << "duplicate (" << be_idt << be_idt_nl << "u.u_." << ub->local_name () - << "_->ptr ()" << be_uidt_nl + << "_->ptr ()" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")," << be_uidt_nl << "*this" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 5b45fd9505d..24909678547 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -363,15 +363,15 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl + *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; @@ -460,15 +460,15 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) if (bt_is_defined) { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << bt->name () << "::"; + << bt->name () << "::_"; } else { *os << "OBJECT_FIELD (" << be_idt << be_idt_nl - << "TAO::Objref_Traits<" << node->name () << ">::tao"; + << "TAO::Objref_Traits<" << node->name () << ">::"; } - *os << "_duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl + *os << "duplicate (val)" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; @@ -690,7 +690,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "void" << be_nl << bu->name () << "::" << ub->local_name () << " ("; - + AST_PredefinedType::PredefinedType pt = node->pt (); @@ -712,7 +712,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << bt->name () << " &"; } - else + else { *os << bt->name (); } @@ -762,7 +762,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( break; case AST_PredefinedType::PT_value: *os << "CORBA::add_ref (val);" << be_nl - << "this->u_." << ub->local_name () + << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl; break; @@ -900,7 +900,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) // (1) Set from a const. *os << "// Accessor to set the member." << be_nl - << "ACE_INLINE" << be_nl + << "ACE_INLINE" << be_nl << "void" << be_nl << bu->name () << "::" << ub->local_name () << " (const " << bt->name () << " &val)" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 7429edbde40..869e85a1e6b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -70,7 +70,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "void" << be_nl - << "TAO::Value_Traits<" << node->name () << ">::tao_add_ref (" + << "TAO::Value_Traits<" << node->name () << ">::add_ref (" << be_idt << be_idt_nl << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl @@ -81,7 +81,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "void" << be_nl - << "TAO::Value_Traits<" << node->name () << ">::tao_remove_ref (" + << "TAO::Value_Traits<" << node->name () << ">::remove_ref (" << be_idt << be_idt_nl << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl @@ -92,7 +92,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "void" << be_nl - << "TAO::Value_Traits<" << node->name () << ">::tao_release (" + << "TAO::Value_Traits<" << node->name () << ">::release (" << be_idt << be_idt_nl << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl @@ -233,7 +233,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}"; // If we inherit from CORBA::Object and/or CORBA::AbstractBase - // (in addition to CORBA::ValueBase) we have to add these + // (in addition to CORBA::ValueBase) we have to add these // to avoid ambiguity. if (node->n_supports () > 0) { diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 3d0e03ee4b9..f2269ab55fd 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -12,6 +12,7 @@ #include "tao/Acceptor_Filter.h" #include "tao/Endpoint.h" #include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 60d70e90e00..4b9199cdcf1 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -1,6 +1,7 @@ // $Id$ #include "Object.h" #include "Adapter.h" +#include "SystemException.h" #include "debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 6e6dd7ed1ef..a3723a868f3 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp index 5a08003b1df..66aeedb132c 100644 --- a/TAO/tao/Any_Basic_Impl.cpp +++ b/TAO/tao/Any_Basic_Impl.cpp @@ -4,6 +4,7 @@ #include "tao/Typecode.h" #include "tao/Any.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" @@ -19,49 +20,48 @@ namespace TAO : Any_Impl (0, tc), kind_ (tc ? tc->kind_ : CORBA::tk_null) { - CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind, - this->kind_); + CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (this->kind_); switch (tckind) { case CORBA::tk_short: - this->u_.s = *ACE_static_cast (CORBA::Short *, value); + this->u_.s = *static_cast<CORBA::Short *> (value); break; case CORBA::tk_ushort: - this->u_.us = *ACE_static_cast (CORBA::UShort *, value); + this->u_.us = *static_cast<CORBA::UShort *> (value); break; case CORBA::tk_long: - this->u_.l = *ACE_static_cast (CORBA::Long *, value); + this->u_.l = *static_cast<CORBA::Long *> (value); break; case CORBA::tk_ulong: - this->u_.ul = *ACE_static_cast (CORBA::ULong *, value); + this->u_.ul = *static_cast<CORBA::ULong *> (value); break; case CORBA::tk_float: - this->u_.f = *ACE_static_cast (CORBA::Float *, value); + this->u_.f = *static_cast<CORBA::Float *> (value); break; case CORBA::tk_double: - this->u_.d = *ACE_static_cast (CORBA::Double *, value); + this->u_.d = *static_cast<CORBA::Double *> (value); break; case CORBA::tk_boolean: - this->u_.b = *ACE_static_cast (CORBA::Boolean *, value); + this->u_.b = *static_cast<CORBA::Boolean *> (value); break; case CORBA::tk_char: - this->u_.c = *ACE_static_cast (CORBA::Char *, value); + this->u_.c = *static_cast<CORBA::Char *> (value); break; case CORBA::tk_octet: - this->u_.o = *ACE_static_cast (CORBA::Octet *, value); + this->u_.o = *static_cast<CORBA::Octet *> (value); break; case CORBA::tk_longlong: - this->u_.ll = *ACE_static_cast (CORBA::LongLong *, value); + this->u_.ll = *static_cast<CORBA::LongLong *> (value); break; case CORBA::tk_ulonglong: - this->u_.ull = *ACE_static_cast (CORBA::ULongLong *, value); + this->u_.ull = *static_cast<CORBA::ULongLong *> (value); break; case CORBA::tk_longdouble: - this->u_.ld = *ACE_static_cast (CORBA::LongDouble *, value); + this->u_.ld = *static_cast<CORBA::LongDouble *> (value); break; case CORBA::tk_wchar: - this->u_.wc = *ACE_static_cast (CORBA::WChar *, value); + this->u_.wc = *static_cast<CORBA::WChar *> (value); break; default: break; @@ -80,7 +80,7 @@ namespace TAO Any_Basic_Impl *new_impl = 0; ACE_NEW (new_impl, Any_Basic_Impl (tc, - ACE_const_cast (void *, value))); + const_cast<void *> (value))); any.replace (new_impl); } @@ -150,7 +150,7 @@ namespace TAO Any_Basic_Impl::assign_value (_tao_elem, replacement, tck); - ACE_const_cast (CORBA::Any &, any).replace (replacement); + const_cast<CORBA::Any &> (any).replace (replacement); replacement_safety.release (); return 1; } @@ -169,8 +169,7 @@ namespace TAO CORBA::Boolean Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr) { - CORBA::TCKind tckind = ACE_static_cast (CORBA::TCKind, - this->kind_); + CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_); switch (tckind) { @@ -216,9 +215,7 @@ namespace TAO Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr, CORBA::Long tck) { - CORBA::TCKind tckind = - ACE_static_cast (CORBA::TCKind, - tck); + CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck); switch (tckind) { case CORBA::tk_short: @@ -265,7 +262,7 @@ namespace TAO Any_Basic_Impl * Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc) { - CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, tc->kind_); + CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tc->kind_); TAO::Any_Basic_Impl * retval = 0; switch (kind) @@ -315,49 +312,48 @@ namespace TAO Any_Basic_Impl *src, CORBA::Long tck) { - CORBA::TCKind kind = - ACE_static_cast (CORBA::TCKind, tck); + CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck); switch (kind) { case CORBA::tk_short: - *ACE_static_cast (CORBA::Short *, dest) = src->u_.s; + *static_cast<CORBA::Short *> (dest) = src->u_.s; break; case CORBA::tk_ushort: - *ACE_static_cast (CORBA::UShort *, dest) = src->u_.us; + *static_cast<CORBA::UShort *> (dest) = src->u_.us; break; case CORBA::tk_long: - *ACE_static_cast (CORBA::Long *, dest) = src->u_.l; + *static_cast<CORBA::Long *> (dest) = src->u_.l; break; case CORBA::tk_ulong: - *ACE_static_cast (CORBA::ULong *, dest) = src->u_.ul; + *static_cast<CORBA::ULong *> (dest) = src->u_.ul; break; case CORBA::tk_float: - *ACE_static_cast (CORBA::Float *, dest) = src->u_.f; + *static_cast<CORBA::Float *> (dest) = src->u_.f; break; case CORBA::tk_double: - *ACE_static_cast (CORBA::Double *, dest) = src->u_.d; + *static_cast<CORBA::Double *> (dest) = src->u_.d; break; case CORBA::tk_boolean: - *ACE_static_cast (CORBA::Boolean *, dest) = src->u_.b; + *static_cast<CORBA::Boolean *> (dest) = src->u_.b; break; case CORBA::tk_char: - *ACE_static_cast (CORBA::Char *, dest) = src->u_.c; + *static_cast<CORBA::Char *> (dest) = src->u_.c; break; case CORBA::tk_octet: - *ACE_static_cast (CORBA::Octet *, dest) = src->u_.o; + *static_cast<CORBA::Octet *> (dest) = src->u_.o; break; case CORBA::tk_longlong: - *ACE_static_cast (CORBA::LongLong *, dest) = src->u_.ll; + *static_cast<CORBA::LongLong *> (dest) = src->u_.ll; break; case CORBA::tk_ulonglong: - *ACE_static_cast (CORBA::ULongLong *, dest) = src->u_.ull; + *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull; break; case CORBA::tk_longdouble: - *ACE_static_cast (CORBA::LongDouble *, dest) = src->u_.ld; + *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld; break; case CORBA::tk_wchar: - *ACE_static_cast (CORBA::WChar *, dest) = src->u_.wc; + *static_cast<CORBA::WChar *> (dest) = src->u_.wc; break; default: break; diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp index 57e1928f960..2e453f93ede 100644 --- a/TAO/tao/Any_Dual_Impl_T.cpp +++ b/TAO/tao/Any_Dual_Impl_T.cpp @@ -8,7 +8,7 @@ #include "tao/Marshal.h" #include "tao/CORBA_String.h" #include "tao/Environment.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" #include "tao/CDR.h" #include "tao/Typecode.h" diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp index bf1ba96f614..2a139aeeebc 100644 --- a/TAO/tao/Any_Impl.cpp +++ b/TAO/tao/Any_Impl.cpp @@ -3,8 +3,10 @@ #include "Any_Impl.h" #include "Marshal.h" #include "CORBA_String.h" +#include "SystemException.h" #include "Typecode.h" + #include "ace/Guard_T.h" diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp index 9c0f2b18110..7f432b92c30 100644 --- a/TAO/tao/Any_Impl_T.cpp +++ b/TAO/tao/Any_Impl_T.cpp @@ -8,7 +8,7 @@ #include "tao/Marshal.h" #include "tao/CDR.h" #include "tao/Environment.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" #include "tao/Typecode.h" #include "ace/CORBA_macros.h" diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp index b398583f18c..0f5794c2225 100644 --- a/TAO/tao/Any_SystemException.cpp +++ b/TAO/tao/Any_SystemException.cpp @@ -7,16 +7,19 @@ #include "Environment.h" #include "Marshal.h" #include "CORBA_String.h" +#include "SystemException.h" #include "Typecode.h" #include "ace/Auto_Ptr.h" #include "ace/CORBA_macros.h" #include "ace/Auto_Ptr.h" + ACE_RCSID (tao, Any_SystemException, "$Id$") + TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor, CORBA::TypeCode_ptr tc, CORBA::SystemException * const val) diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp index 6e9f5ab53b4..65b61162a2a 100644 --- a/TAO/tao/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/Any_Unknown_IDL_Type.cpp @@ -3,6 +3,7 @@ #include "tao/Any_Unknown_IDL_Type.h" #include "tao/Valuetype_Adapter.h" #include "tao/ORB_Core.h" +#include "tao/SystemException.h" #include "tao/Marshal.h" #include "tao/Typecode.h" #include "tao/CDR.h" diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index a2a49674086..63093981053 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -21,7 +21,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); this->ptr_ = p; } @@ -36,10 +36,10 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::operator= ( { if (this != &p) { - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); // Deep copy. - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); } return *this; @@ -55,7 +55,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= (T_slice * p) if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); this->ptr_ = p; } @@ -70,10 +70,10 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator= ( { if (this != &p) { - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); // Deep copy. - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); } return *this; @@ -88,7 +88,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor ( ) { T_slice * tmp = static_cast<T_slice *> (_tao_void_pointer); - TAO::Array_Traits<T,T_slice,TAG>::tao_free (tmp); + TAO::Array_Traits<T,T_slice,TAG>::free (tmp); } #endif /* TAO_ARRAY_VAROUT_T_C */ diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index c55e07de677..e036dd6bb79 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -31,11 +31,11 @@ namespace TAO template<typename T, typename T_slice, typename TAG> struct Array_Traits { - static T_slice * tao_alloc (void); - static void tao_free (T_slice * _tao_slice); - static T_slice * tao_dup (const T_slice * _tao_slice); - static void tao_copy (T_slice * _tao_to, - const T_slice * _tao_from); + static T_slice * alloc (void); + static void free (T_slice * _tao_slice); + static T_slice * dup (const T_slice * _tao_slice); + static void copy (T_slice * _tao_to, + const T_slice * _tao_from); }; } diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index d8354544595..4a4809ee8f7 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -20,14 +20,14 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T ( const TAO_Array_Var_Base_T & p ) { - this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::tao_dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice,TAG>::dup (p.in ()); } template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T (void) { - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); } template<typename T, typename T_slice, typename TAG> @@ -74,7 +74,7 @@ ACE_INLINE T_slice *& TAO_Array_Var_Base_T<T,T_slice,TAG>::out (void) { - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); this->ptr_ = 0; return this->ptr_; } @@ -161,7 +161,7 @@ ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p) : ptr_ (p.out ()) { - TAO::Array_Traits<T,T_slice,TAG>::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice,TAG>::free (this->ptr_); this->ptr_ = 0; } @@ -386,5 +386,5 @@ ACE_INLINE T_slice * TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void) { - return TAO::Array_Traits<T,T_slice,TAG>::tao_alloc (); + return TAO::Array_Traits<T,T_slice,TAG>::alloc (); } diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index 2ecd74e9285..f28ca8f2107 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_ORB_Core; class TAO_Policy_Validator; diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 309ff9b2a5d..419f2a4f64b 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -57,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION BiDirPolicy::BidirectionalPolicy_ptr -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_duplicate ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::duplicate ( BiDirPolicy::BidirectionalPolicy_ptr p ) { @@ -66,7 +66,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_release ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release ( BiDirPolicy::BidirectionalPolicy_ptr p ) { @@ -75,14 +75,14 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION BiDirPolicy::BidirectionalPolicy_ptr -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_nil (void) +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::nil (void) { return BiDirPolicy::BidirectionalPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_marshal ( +TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::marshal ( BiDirPolicy::BidirectionalPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -91,7 +91,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*BiDirPolicy__TAO_BidirectionalPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -112,10 +112,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -129,10 +129,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -143,7 +143,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -205,7 +205,7 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< BiDirPolicy::BidirectionalPolicy >; - + template class TAO_Objref_Out_T< BiDirPolicy::BidirectionalPolicy @@ -222,11 +222,10 @@ BiDirPolicy::BidirectionalPolicy::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ BiDirPolicy::BidirectionalPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ BiDirPolicy::BidirectionalPolicy > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index 8d090854786..cdc1291dc3f 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -73,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -89,43 +89,43 @@ namespace TAO namespace BiDirPolicy { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::UShort BidirectionalPolicyValue; typedef CORBA::UShort_out BidirectionalPolicyValue_out; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const BiDirPolicy::BidirectionalPolicyValue NORMAL = 0U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const BiDirPolicy::BidirectionalPolicyValue BOTH = 1U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37U; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__VAR_OUT_CH_ - + class BidirectionalPolicy; typedef BidirectionalPolicy *BidirectionalPolicy_ptr; - + typedef TAO_Objref_Var_T< BidirectionalPolicy > BidirectionalPolicy_var; - + typedef TAO_Objref_Out_T< BidirectionalPolicy @@ -133,91 +133,91 @@ namespace BiDirPolicy BidirectionalPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY_CH_ - + class TAO_BiDirGIOP_Export BidirectionalPolicy : public virtual CORBA::Policy { public: typedef BidirectionalPolicy_ptr _ptr_type; typedef BidirectionalPolicy_var _var_type; - + // The static operations. static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj); - + static BidirectionalPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BidirectionalPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BidirectionalPolicy_ptr _nil (void) { return (BidirectionalPolicy_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual BiDirPolicy::BidirectionalPolicyValue value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. BidirectionalPolicy (void); - + virtual ~BidirectionalPolicy (void); - + private: // Private and unimplemented for concrete interfaces. BidirectionalPolicy (const BidirectionalPolicy &); - + void operator= (const BidirectionalPolicy &); }; @@ -237,18 +237,18 @@ namespace TAO #if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_) #define _BIDIRPOLICY_BIDIRECTIONALPOLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_BiDirGIOP_Export Objref_Traits<BiDirPolicy::BidirectionalPolicy> { - static BiDirPolicy::BidirectionalPolicy_ptr tao_duplicate ( + static BiDirPolicy::BidirectionalPolicy_ptr duplicate ( BiDirPolicy::BidirectionalPolicy_ptr ); - static void tao_release ( + static void release ( BiDirPolicy::BidirectionalPolicy_ptr ); - static BiDirPolicy::BidirectionalPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static BiDirPolicy::BidirectionalPolicy_ptr nil (void); + static CORBA::Boolean marshal ( BiDirPolicy::BidirectionalPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -275,4 +275,3 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 4b169d34ac3..e5c5c7f8c12 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -30,6 +30,7 @@ #include "BoundsC.h" +#include "tao/SystemException.h" #include "tao/CDR.h" #include "tao/Typecode.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index cde985310cb..dc11eeedd16 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -6,8 +6,12 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) #include "TAOC.h" +#include "SystemException.h" + +ACE_RCSID (tao, + Buffering_Constraint_Policy, + "$Id$") -ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") #if ! defined (__ACE_INLINE__) #include "tao/Buffering_Constraint_Policy.i" diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index daf72e720ee..3c62df4c3e5 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -36,6 +36,7 @@ #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" #include "tao/Environment.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "tao/CDR.i" @@ -172,7 +173,7 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL) ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL(TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::MARSHAL(0, CORBA::COMPLETED_YES)); } } @@ -220,7 +221,7 @@ TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL) ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES)); ACE_NOTREACHED(break); default : - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES)); } } diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index c5c604c8f37..a73f43bc43e 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -11,10 +11,12 @@ #include "Typecode.h" #include "Marshal.h" #include "Any_Unknown_IDL_Type.h" +#include "SystemException.h" #include "ORB_Constants.h" + #include "ace/OS_NS_string.h" -ACE_RCSID (TAO_CodecFactory, +ACE_RCSID (tao, CDR_Encaps_Codec, "$Id$") @@ -62,7 +64,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data CORBA::OctetSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -128,7 +130,7 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -201,7 +203,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data CORBA::OctetSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM ), CORBA::COMPLETED_NO @@ -339,7 +341,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM ), CORBA::COMPLETED_NO diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 89209b05011..cd64090e2b4 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -2,6 +2,7 @@ #include "ORB_Core.h" #include "Stub.h" #include "Connector_Registry.h" +#include "SystemException.h" #include "tao/debug.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -280,7 +281,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper ( { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 2950c75a6c7..43ebeb0c0b8 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -3,6 +3,7 @@ #include "CORBANAME_Parser.h" #include "ORB.h" #include "Object.h" +#include "SystemException.h" #include "UB_String_Arguments.h" #include "Invocation_Adapter.h" #include "debug.h" diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl index 7359e828ff9..07eaef27c7f 100644 --- a/TAO/tao/ClientRequestInfo.inl +++ b/TAO/tao/ClientRequestInfo.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "SystemException.h" + ACE_INLINE void TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) { diff --git a/TAO/tao/ClientRequestInfo_i.inl b/TAO/tao/ClientRequestInfo_i.inl index 28e783606a5..877493b58dd 100644 --- a/TAO/tao/ClientRequestInfo_i.inl +++ b/TAO/tao/ClientRequestInfo_i.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "SystemException.h" + ACE_INLINE void TAO_ClientRequestInfo_i::exception (CORBA::Exception *exception) { diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp index f919cb0454d..ff1ba26d9f8 100644 --- a/TAO/tao/CodecFactory.cpp +++ b/TAO/tao/CodecFactory.cpp @@ -4,6 +4,7 @@ #include "CodecFactory.h" #include "CDR_Encaps_Codec.h" +#include "SystemException.h" #include "ORB_Constants.h" ACE_RCSID (TAO_CodecFactory, @@ -42,7 +43,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc // There is no such thing as a "0.x" CDR encapsulation. ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), IOP::Codec::_nil ()); @@ -54,7 +55,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc this->orb_core_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (IOP::Codec::_nil ()); diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp index fa1c5a4aeac..c39ec7142b9 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.cpp +++ b/TAO/tao/CodecFactory_ORBInitializer.cpp @@ -5,6 +5,7 @@ #include "CodecFactory_ORBInitializer.h" #include "CodecFactory.h" #include "ORBInitInfo.h" +#include "SystemException.h" #include "ORB_Constants.h" ACE_RCSID (TAO_CodecFactory, @@ -29,7 +30,7 @@ TAO_CodecFactory_ORBInitializer::pre_init ( TAO_CodecFactory (orb_core), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 3af1ca6500f..9bdb67d0b9e 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -6,12 +6,14 @@ #include "tao/Transport.h" #include "tao/Profile.h" #include "tao/Codeset_Translator_Factory.h" +#include "tao/SystemException.h" +#include "tao/UTF16_BOM_Factory.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/Codeset_Registry.h" #include "ace/OS_NS_string.h" -#include "tao/UTF16_BOM_Factory.h" + ACE_RCSID (tao, Codeset_Manager, diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index 7f81f485e25..57bc3f9d201 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -8,6 +8,7 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #if !defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" @@ -118,7 +119,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, // Failure: Null IOR string pointer ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), -1); @@ -145,7 +146,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior, // Failure: Null pointer to connector in connector registry. ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), -1); diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 913d7394e52..dbd3f67136f 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -58,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr -TAO::Objref_Traits<CORBA::Current>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Current>::duplicate ( CORBA::Current_ptr p ) { @@ -67,7 +67,7 @@ TAO::Objref_Traits<CORBA::Current>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Current>::tao_release ( +TAO::Objref_Traits<CORBA::Current>::release ( CORBA::Current_ptr p ) { @@ -76,14 +76,14 @@ TAO::Objref_Traits<CORBA::Current>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Current_ptr -TAO::Objref_Traits<CORBA::Current>::tao_nil (void) +TAO::Objref_Traits<CORBA::Current>::nil (void) { return CORBA::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Current>::tao_marshal ( +TAO::Objref_Traits<CORBA::Current>::marshal ( CORBA::Current_ptr p, TAO_OutputCDR & cdr ) @@ -92,7 +92,7 @@ TAO::Objref_Traits<CORBA::Current>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -103,7 +103,7 @@ CORBA::Current::Current (void) CORBA::Current::~Current (void) {} -void +void CORBA::Current::_tao_any_destructor (void *_tao_void_pointer) { Current *_tao_tmp_pointer = @@ -121,10 +121,10 @@ CORBA::Current::_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -138,10 +138,10 @@ CORBA::Current::_unchecked_narrow ( { return Current::_nil (); } - + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - + return Current::_duplicate (proxy); } @@ -152,7 +152,7 @@ CORBA::Current::_duplicate (Current_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -210,7 +210,7 @@ CORBA::Current::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::Current >; - + template class TAO_Objref_Out_T< CORBA::Current @@ -227,11 +227,10 @@ CORBA::Current::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::Current > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::Current > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index efdb265e360..bae17f58713 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -66,13 +66,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -82,22 +82,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_) #define _CORBA_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -105,69 +105,69 @@ namespace CORBA Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CURRENT_CH_) #define _CORBA_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Object { public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { return (Current_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Current (void); - + virtual ~Current (void); - + private: // Private and unimplemented for concrete interfaces. Current (const Current &); - + void operator= (const Current &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; // TAO_IDL - Generated from @@ -184,18 +184,18 @@ namespace TAO #if !defined (_CORBA_CURRENT__TRAITS_CH_) #define _CORBA_CURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Current> { - static CORBA::Current_ptr tao_duplicate ( + static CORBA::Current_ptr duplicate ( CORBA::Current_ptr ); - static void tao_release ( + static void release ( CORBA::Current_ptr ); - static CORBA::Current_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Current_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Current_ptr p, TAO_OutputCDR & cdr ); @@ -229,4 +229,3 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &) #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index fbb3ea8c5f4..1c9bbd07eca 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -5,6 +5,7 @@ #include "Object.h" #include "Environment.h" #include "ORB_Constants.h" +#include "SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" @@ -53,7 +54,7 @@ TAO_DLL_Parser::parse_string (const char *ior, ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index dc2666670e6..d6603362980 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -3,6 +3,7 @@ #include "Default_Stub_Factory.h" #include "Stub.h" #include "ORB_Constants.h" +#include "SystemException.h" #include "ace/Log_Msg.h" @@ -18,15 +19,15 @@ TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void) TAO_Stub * TAO_Default_Stub_Factory::create_stub (const char *repository_id, - const TAO_MProfile &profiles, - TAO_ORB_Core *orb_core - ACE_ENV_ARG_DECL) + const TAO_MProfile &profiles, + TAO_ORB_Core *orb_core + ACE_ENV_ARG_DECL) { TAO_Stub *retval = 0; ACE_NEW_THROW_EX (retval, TAO_Stub (repository_id, profiles, orb_core), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (0, CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (retval); diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index f41b34fa77d..8da6882f61d 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -100,7 +100,7 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::Policy> : public @@ -117,7 +117,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public @@ -141,7 +141,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr -TAO::Objref_Traits<CORBA::DomainManager>::tao_duplicate ( +TAO::Objref_Traits<CORBA::DomainManager>::duplicate ( CORBA::DomainManager_ptr p ) { @@ -150,7 +150,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::DomainManager>::tao_release ( +TAO::Objref_Traits<CORBA::DomainManager>::release ( CORBA::DomainManager_ptr p ) { @@ -159,14 +159,14 @@ TAO::Objref_Traits<CORBA::DomainManager>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DomainManager_ptr -TAO::Objref_Traits<CORBA::DomainManager>::tao_nil (void) +TAO::Objref_Traits<CORBA::DomainManager>::nil (void) { return CORBA::DomainManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::DomainManager>::tao_marshal ( +TAO::Objref_Traits<CORBA::DomainManager>::marshal ( CORBA::DomainManager_ptr p, TAO_OutputCDR & cdr ) @@ -175,7 +175,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -195,21 +195,21 @@ TAO::Collocation_Proxy_Broker * { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_DomainManager_Proxy_Broker_ == 0) { CORBA_DomainManager_setup_collocation (); } - + TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval; TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_policy_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -218,10 +218,10 @@ TAO::Collocation_Proxy_Broker * 17, this->the_TAO_DomainManager_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -244,7 +244,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation () CORBA::DomainManager::~DomainManager (void) {} -void +void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) { DomainManager *_tao_tmp_pointer = @@ -289,7 +289,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -339,7 +339,7 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr -TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::duplicate ( CORBA::ConstructionPolicy_ptr p ) { @@ -348,7 +348,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_release ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::release ( CORBA::ConstructionPolicy_ptr p ) { @@ -357,14 +357,14 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstructionPolicy_ptr -TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_nil (void) +TAO::Objref_Traits<CORBA::ConstructionPolicy>::nil (void) { return CORBA::ConstructionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_marshal ( +TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( CORBA::ConstructionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -373,7 +373,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -394,23 +394,23 @@ void CORBA::ConstructionPolicy::make_domain_manager ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0) { CORBA_ConstructionPolicy_setup_collocation (); } - + TAO::Arg_Traits<void>::ret_val _tao_retval; TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type); TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_type, &_tao_constr_policy }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -419,7 +419,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( 19, this->the_TAO_ConstructionPolicy_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -438,14 +438,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation () this->the_TAO_ConstructionPolicy_Proxy_Broker_ = ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Policy_setup_collocation (); } CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} -void +void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) { ConstructionPolicy *_tao_tmp_pointer = @@ -490,7 +490,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -537,7 +537,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_) @@ -611,21 +611,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::CORBA::DomainManager RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -647,21 +647,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -677,21 +677,21 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = _tao_sequence[i].in ()->marshal (strm); } - + return _tao_marshal_flag; } - + return 0; } @@ -701,7 +701,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -711,28 +711,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -794,7 +794,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::DomainManager >; - + template class TAO_Objref_Out_T< CORBA::DomainManager @@ -819,7 +819,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::ConstructionPolicy >; - + template class TAO_Objref_Out_T< CORBA::ConstructionPolicy @@ -922,7 +922,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::DomainManager > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DomainManager @@ -947,7 +947,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::ConstructionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::ConstructionPolicy @@ -997,5 +997,4 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index f17de220707..4cbee563d39 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -428,14 +428,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::DomainManager> { - static CORBA::DomainManager_ptr tao_duplicate ( + static CORBA::DomainManager_ptr duplicate ( CORBA::DomainManager_ptr ); - static void tao_release ( + static void release ( CORBA::DomainManager_ptr ); - static CORBA::DomainManager_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::DomainManager_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::DomainManager_ptr p, TAO_OutputCDR & cdr ); @@ -449,14 +449,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::ConstructionPolicy> { - static CORBA::ConstructionPolicy_ptr tao_duplicate ( + static CORBA::ConstructionPolicy_ptr duplicate ( CORBA::ConstructionPolicy_ptr ); - static void tao_release ( + static void release ( CORBA::ConstructionPolicy_ptr ); - static CORBA::ConstructionPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ConstructionPolicy_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ConstructionPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index 47dc1ae5dbf..fd1ffe9666d 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -57,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAny_ptr -TAO::Objref_Traits<DynamicAny::DynAny>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynAny>::duplicate ( DynamicAny::DynAny_ptr p ) { @@ -66,7 +66,7 @@ TAO::Objref_Traits<DynamicAny::DynAny>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynAny>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynAny>::release ( DynamicAny::DynAny_ptr p ) { @@ -75,14 +75,14 @@ TAO::Objref_Traits<DynamicAny::DynAny>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAny_ptr -TAO::Objref_Traits<DynamicAny::DynAny>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynAny>::nil (void) { return DynamicAny::DynAny::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynAny>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynAny>::marshal ( DynamicAny::DynAny_ptr p, TAO_OutputCDR & cdr ) @@ -364,7 +364,7 @@ DynamicAny::DynAny::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynFixed_ptr -TAO::Objref_Traits<DynamicAny::DynFixed>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynFixed>::duplicate ( DynamicAny::DynFixed_ptr p ) { @@ -373,7 +373,7 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynFixed>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynFixed>::release ( DynamicAny::DynFixed_ptr p ) { @@ -382,14 +382,14 @@ TAO::Objref_Traits<DynamicAny::DynFixed>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynFixed_ptr -TAO::Objref_Traits<DynamicAny::DynFixed>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynFixed>::nil (void) { return DynamicAny::DynFixed::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynFixed>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynFixed>::marshal ( DynamicAny::DynFixed_ptr p, TAO_OutputCDR & cdr ) @@ -505,7 +505,7 @@ DynamicAny::DynFixed::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynEnum_ptr -TAO::Objref_Traits<DynamicAny::DynEnum>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynEnum>::duplicate ( DynamicAny::DynEnum_ptr p ) { @@ -514,7 +514,7 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynEnum>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynEnum>::release ( DynamicAny::DynEnum_ptr p ) { @@ -523,14 +523,14 @@ TAO::Objref_Traits<DynamicAny::DynEnum>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynEnum_ptr -TAO::Objref_Traits<DynamicAny::DynEnum>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynEnum>::nil (void) { return DynamicAny::DynEnum::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynEnum>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynEnum>::marshal ( DynamicAny::DynEnum_ptr p, TAO_OutputCDR & cdr ) @@ -744,7 +744,7 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynStruct_ptr -TAO::Objref_Traits<DynamicAny::DynStruct>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynStruct>::duplicate ( DynamicAny::DynStruct_ptr p ) { @@ -753,7 +753,7 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynStruct>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynStruct>::release ( DynamicAny::DynStruct_ptr p ) { @@ -762,14 +762,14 @@ TAO::Objref_Traits<DynamicAny::DynStruct>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynStruct_ptr -TAO::Objref_Traits<DynamicAny::DynStruct>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynStruct>::nil (void) { return DynamicAny::DynStruct::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynStruct>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynStruct>::marshal ( DynamicAny::DynStruct_ptr p, TAO_OutputCDR & cdr ) @@ -885,7 +885,7 @@ DynamicAny::DynStruct::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynUnion_ptr -TAO::Objref_Traits<DynamicAny::DynUnion>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynUnion>::duplicate ( DynamicAny::DynUnion_ptr p ) { @@ -894,7 +894,7 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynUnion>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynUnion>::release ( DynamicAny::DynUnion_ptr p ) { @@ -903,14 +903,14 @@ TAO::Objref_Traits<DynamicAny::DynUnion>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynUnion_ptr -TAO::Objref_Traits<DynamicAny::DynUnion>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynUnion>::nil (void) { return DynamicAny::DynUnion::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynUnion>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynUnion>::marshal ( DynamicAny::DynUnion_ptr p, TAO_OutputCDR & cdr ) @@ -1117,7 +1117,7 @@ DynamicAny::DynAnySeq::~DynAnySeq (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynSequence_ptr -TAO::Objref_Traits<DynamicAny::DynSequence>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynSequence>::duplicate ( DynamicAny::DynSequence_ptr p ) { @@ -1126,7 +1126,7 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynSequence>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynSequence>::release ( DynamicAny::DynSequence_ptr p ) { @@ -1135,14 +1135,14 @@ TAO::Objref_Traits<DynamicAny::DynSequence>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynSequence_ptr -TAO::Objref_Traits<DynamicAny::DynSequence>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynSequence>::nil (void) { return DynamicAny::DynSequence::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynSequence>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynSequence>::marshal ( DynamicAny::DynSequence_ptr p, TAO_OutputCDR & cdr ) @@ -1258,7 +1258,7 @@ DynamicAny::DynSequence::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynArray_ptr -TAO::Objref_Traits<DynamicAny::DynArray>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynArray>::duplicate ( DynamicAny::DynArray_ptr p ) { @@ -1267,7 +1267,7 @@ TAO::Objref_Traits<DynamicAny::DynArray>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynArray>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynArray>::release ( DynamicAny::DynArray_ptr p ) { @@ -1276,14 +1276,14 @@ TAO::Objref_Traits<DynamicAny::DynArray>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynArray_ptr -TAO::Objref_Traits<DynamicAny::DynArray>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynArray>::nil (void) { return DynamicAny::DynArray::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynArray>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynArray>::marshal ( DynamicAny::DynArray_ptr p, TAO_OutputCDR & cdr ) @@ -1399,7 +1399,7 @@ DynamicAny::DynArray::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynValue_ptr -TAO::Objref_Traits<DynamicAny::DynValue>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynValue>::duplicate ( DynamicAny::DynValue_ptr p ) { @@ -1408,7 +1408,7 @@ TAO::Objref_Traits<DynamicAny::DynValue>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynValue>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynValue>::release ( DynamicAny::DynValue_ptr p ) { @@ -1417,14 +1417,14 @@ TAO::Objref_Traits<DynamicAny::DynValue>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynValue_ptr -TAO::Objref_Traits<DynamicAny::DynValue>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynValue>::nil (void) { return DynamicAny::DynValue::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynValue>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynValue>::marshal ( DynamicAny::DynValue_ptr p, TAO_OutputCDR & cdr ) @@ -1540,7 +1540,7 @@ DynamicAny::DynValue::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAnyFactory_ptr -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_duplicate ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::duplicate ( DynamicAny::DynAnyFactory_ptr p ) { @@ -1549,7 +1549,7 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_release ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::release ( DynamicAny::DynAnyFactory_ptr p ) { @@ -1558,14 +1558,14 @@ TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION DynamicAny::DynAnyFactory_ptr -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_nil (void) +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::nil (void) { return DynamicAny::DynAnyFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<DynamicAny::DynAnyFactory>::tao_marshal ( +TAO::Objref_Traits<DynamicAny::DynAnyFactory>::marshal ( DynamicAny::DynAnyFactory_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 1d09f559712..686c7a586a8 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -2296,14 +2296,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny> { - static DynamicAny::DynAny_ptr tao_duplicate ( + static DynamicAny::DynAny_ptr duplicate ( DynamicAny::DynAny_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynAny_ptr ); - static DynamicAny::DynAny_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynAny_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynAny_ptr p, TAO_OutputCDR & cdr ); @@ -2317,14 +2317,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynFixed> { - static DynamicAny::DynFixed_ptr tao_duplicate ( + static DynamicAny::DynFixed_ptr duplicate ( DynamicAny::DynFixed_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynFixed_ptr ); - static DynamicAny::DynFixed_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynFixed_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynFixed_ptr p, TAO_OutputCDR & cdr ); @@ -2338,14 +2338,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynEnum> { - static DynamicAny::DynEnum_ptr tao_duplicate ( + static DynamicAny::DynEnum_ptr duplicate ( DynamicAny::DynEnum_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynEnum_ptr ); - static DynamicAny::DynEnum_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynEnum_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynEnum_ptr p, TAO_OutputCDR & cdr ); @@ -2359,14 +2359,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynStruct> { - static DynamicAny::DynStruct_ptr tao_duplicate ( + static DynamicAny::DynStruct_ptr duplicate ( DynamicAny::DynStruct_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynStruct_ptr ); - static DynamicAny::DynStruct_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynStruct_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynStruct_ptr p, TAO_OutputCDR & cdr ); @@ -2380,14 +2380,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynUnion> { - static DynamicAny::DynUnion_ptr tao_duplicate ( + static DynamicAny::DynUnion_ptr duplicate ( DynamicAny::DynUnion_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynUnion_ptr ); - static DynamicAny::DynUnion_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynUnion_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynUnion_ptr p, TAO_OutputCDR & cdr ); @@ -2401,14 +2401,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynSequence> { - static DynamicAny::DynSequence_ptr tao_duplicate ( + static DynamicAny::DynSequence_ptr duplicate ( DynamicAny::DynSequence_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynSequence_ptr ); - static DynamicAny::DynSequence_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynSequence_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynSequence_ptr p, TAO_OutputCDR & cdr ); @@ -2422,14 +2422,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynArray> { - static DynamicAny::DynArray_ptr tao_duplicate ( + static DynamicAny::DynArray_ptr duplicate ( DynamicAny::DynArray_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynArray_ptr ); - static DynamicAny::DynArray_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynArray_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynArray_ptr p, TAO_OutputCDR & cdr ); @@ -2443,14 +2443,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynValue> { - static DynamicAny::DynValue_ptr tao_duplicate ( + static DynamicAny::DynValue_ptr duplicate ( DynamicAny::DynValue_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynValue_ptr ); - static DynamicAny::DynValue_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynValue_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynValue_ptr p, TAO_OutputCDR & cdr ); @@ -2464,14 +2464,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAnyFactory> { - static DynamicAny::DynAnyFactory_ptr tao_duplicate ( + static DynamicAny::DynAnyFactory_ptr duplicate ( DynamicAny::DynAnyFactory_ptr ); - static void tao_release ( + static void release ( DynamicAny::DynAnyFactory_ptr ); - static DynamicAny::DynAnyFactory_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static DynamicAny::DynAnyFactory_ptr nil (void); + static CORBA::Boolean marshal ( DynamicAny::DynAnyFactory_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 9ca2232f3f3..ed48e85cd35 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -10,6 +10,7 @@ ACE_RCSID (DynamicInterface, #include "tao/NVList.h" #include "tao/Environment.h" #include "tao/CORBA_String.h" +#include "tao/SystemException.h" #include "ace/Guard_T.h" diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 80061329001..4a2c034b1ea 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -6,6 +6,7 @@ ACE_RCSID (DynamicInterface, #include "tao/Typecode.h" #include "tao/Environment.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) # include "ExceptionList.inl" diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 1e06bf14085..e540116ac9d 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -5,9 +5,12 @@ #include "tao/Any.h" #include "tao/Environment.h" #include "tao/TC_Constants_Forward.h" +#include "tao/SystemException.h" + #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" + ACE_RCSID (DynamicInterface, Unknown_User_Exception, "$Id$") diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index ba2b41bcc66..e80e61525f8 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/UserException.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index d5c5e5a18fb..70dd1ecbcb6 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,6 +1,6 @@ #include "Environment.h" #include "ORB_Core.h" -#include "Exception.h" +#include "SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index b633d28e7d5..e8711f28f66 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,9 +1,7 @@ -// $id: Exception.cpp,v 1.182 2003/11/10 20:29:26 dhinton Exp $ - -// THREADING NOTE: calling thread handles mutual exclusion policy -// on all of these data structures. +// $Id$ #include "Exception.h" +#include "SystemException.h" #include "Environment.h" #include "Any_SystemException.h" #include "Any_Dual_Impl_T.h" @@ -31,70 +29,27 @@ #include "ace/OS_NS_stdio.h" + ACE_RCSID (tao, Exception, "$Id$") -// Static initializers. - -ACE_Allocator *TAO_Exceptions::global_allocator_; - -// Flag that denotes that the TAO TypeCode constants have been -// initialized. -bool TAO_Exceptions::initialized_ = false; - -namespace TAO -{ - // TAO specific typecode. - extern CORBA::TypeCode_ptr TC_completion_status; -} - - -/** - * @name @c errno Encoding - * - * The @c errno encoding is located in the bottom 7 bits. - */ -//@{ -const CORBA::ULong TAO_UNSPECIFIED_MINOR_CODE = 0x0U; -const CORBA::ULong TAO_ETIMEDOUT_MINOR_CODE = 0x1U; -const CORBA::ULong TAO_ENFILE_MINOR_CODE = 0x2U; -const CORBA::ULong TAO_EMFILE_MINOR_CODE = 0x3U; -const CORBA::ULong TAO_EPIPE_MINOR_CODE = 0x4U; -const CORBA::ULong TAO_ECONNREFUSED_MINOR_CODE = 0x5U; -const CORBA::ULong TAO_ENOENT_MINOR_CODE = 0x6U; -const CORBA::ULong TAO_EBADF_MINOR_CODE = 0x7U; -const CORBA::ULong TAO_ENOSYS_MINOR_CODE = 0x8U; -const CORBA::ULong TAO_EPERM_MINOR_CODE = 0x9U; -const CORBA::ULong TAO_EAFNOSUPPORT_MINOR_CODE = 0xAU; -const CORBA::ULong TAO_EAGAIN_MINOR_CODE = 0xBU; -const CORBA::ULong TAO_ENOMEM_MINOR_CODE = 0xCU; -const CORBA::ULong TAO_EACCES_MINOR_CODE = 0xDU; -const CORBA::ULong TAO_EFAULT_MINOR_CODE = 0xEU; -const CORBA::ULong TAO_EBUSY_MINOR_CODE = 0xFU; -const CORBA::ULong TAO_EEXIST_MINOR_CODE = 0x10U; -const CORBA::ULong TAO_EINVAL_MINOR_CODE = 0x11U; -const CORBA::ULong TAO_ECOMM_MINOR_CODE = 0x12U; -const CORBA::ULong TAO_ECONNRESET_MINOR_CODE = 0x13U; -const CORBA::ULong TAO_ENOTSUP_MINOR_CODE = 0x14U; -// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU! -//@} // **************************************************************** -CORBA::Exception::Exception (const char *repository_id, - const char *local_name) +CORBA::Exception::Exception (const char * repository_id, + const char * local_name) : id_ (CORBA::string_dup (repository_id)), name_ (CORBA::string_dup (local_name)) { - ACE_ASSERT (this->id_ != 0 && this->name_ != 0); + ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); } CORBA::Exception::Exception (const CORBA::Exception &src) : id_ (CORBA::string_dup (src.id_)), name_ (CORBA::string_dup (src.name_)) { - ACE_ASSERT (this->id_ != 0 && this->name_ != 0); + ACE_ASSERT (this->id_.in () != 0 && this->name_.in () != 0); } // NOTE: It's this code, not anything defined in a subclass, which is @@ -102,35 +57,23 @@ CORBA::Exception::Exception (const CORBA::Exception &src) // can do this because it's got the local name and the id. CORBA::Exception::Exception (void) - : id_ (0), - name_ (0) + : id_ (), + name_ () { } CORBA::Exception::~Exception (void) { - CORBA::string_free (this->id_); - CORBA::string_free (this->name_); } CORBA::Exception & CORBA::Exception::operator= (const CORBA::Exception &src) { - if (this->id_) - { - CORBA::string_free (this->id_); - } - this->id_ = CORBA::string_dup (src.id_); - ACE_ASSERT (this->id_ != 0); - - if (this->name_) - { - CORBA::string_free (this->name_); - } + ACE_ASSERT (this->id_.in () != 0); this->name_ = CORBA::string_dup (src.name_); - ACE_ASSERT (this->name_ != 0); + ACE_ASSERT (this->name_.in () != 0); return *this; } @@ -138,13 +81,13 @@ CORBA::Exception::operator= (const CORBA::Exception &src) const char * CORBA::Exception::_rep_id (void) const { - return this->id_; + return this->id_.in (); } const char * CORBA::Exception::_name (void) const { - return this->name_; + return this->name_.in (); } CORBA::TypeCode_ptr @@ -215,1187 +158,6 @@ namespace CORBA #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ -// Avoid zillions of not-quite-inlined copies of utilities. - -CORBA::UserException::UserException (void) -{ -} - -CORBA::UserException::UserException (const char *repository_id, - const char *local_name) - : CORBA::Exception (repository_id, - local_name) -{ -} - -CORBA::UserException::~UserException (void) -{ -} - -CORBA::UserException & -CORBA::UserException::operator= (const CORBA::UserException &src) -{ - this->Exception::operator= (src); - return *this; -} - -int -CORBA::UserException::_is_a (const char* interface_id) const -{ - return ACE_OS::strcmp (interface_id, - "IDL:omg.org/CORBA/UserException:1.0") == 0 - || this->Exception::_is_a (interface_id); -} - -CORBA::UserException* -CORBA::UserException::_downcast (CORBA::Exception* exception) -{ - if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) - { - return dynamic_cast<CORBA::UserException *> (exception); - } - - return 0; -} - -const CORBA::UserException* -CORBA::UserException::_downcast (const CORBA::Exception *exception) -{ - if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) - { - return dynamic_cast<const CORBA::UserException *> (exception); - } - - return 0; -} - -ACE_CString -CORBA::UserException::_info (void) const -{ - // @@ we can use the exception's typecode to dump all the data held - // within it ... - - ACE_CString user_exception_info = "user exception, ID '"; - user_exception_info += this->_rep_id (); - user_exception_info += "'"; - return user_exception_info; -} - -// **************************************************************** - -namespace CORBA -{ - CORBA::TypeCode_ptr _tc_UnknownUserException = 0; -} - -// **************************************************************** - -CORBA::SystemException::SystemException (void) -{ -} - -CORBA::SystemException::SystemException (const char *repository_id, - const char *local_name, - CORBA::ULong code, - CORBA::CompletionStatus completed) - : CORBA::Exception (repository_id, - local_name), - minor_ (code), - completed_ (completed) -{ -} - -CORBA::SystemException::SystemException (CORBA::ULong code, - CORBA::CompletionStatus completed) - : minor_ (code), - completed_ (completed) -{ -} - - -CORBA::SystemException::SystemException (const CORBA::SystemException &src) - : CORBA::Exception (src), - minor_ (src.minor_), - completed_ (src.completed_) -{ -} - -CORBA::SystemException::~SystemException (void) -{ -} - -CORBA::SystemException & -CORBA::SystemException::operator= (const CORBA::SystemException &src) -{ - this->Exception::operator= (src); - - this->minor_ = src.minor_; - this->completed_ = src.completed_; - - return *this; -} - - -int -CORBA::SystemException::_is_a (const char* interface_id) const -{ - return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) || - (ACE_OS::strcmp (interface_id, - "IDL:omg.org/CORBA/SystemException:1.0") == 0) - || this->Exception::_is_a (interface_id)); -} - -CORBA::SystemException* -CORBA::SystemException::_downcast (CORBA::Exception* exception) -{ - if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) - { - return dynamic_cast<CORBA::SystemException *> (exception); - } - - return 0; -} - -const CORBA::SystemException* -CORBA::SystemException::_downcast (const CORBA::Exception *exception) -{ - if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) - { - return dynamic_cast<const CORBA::SystemException *> (exception); - } - - return 0; -} - -void -CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const -{ - if (cdr.write_string (this->_rep_id ()) - && cdr.write_ulong (this->minor ()) - && cdr.write_ulong (this->completed ())) - { - return; - } - - ACE_THROW (CORBA::MARSHAL ()); -} - -void -CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL) -{ - // The string is read by the caller, to determine the exact type of - // the exception. We just decode the fields... - // cdr.read_string (this->id ()); - CORBA::ULong tmp; - - if (cdr.read_ulong (this->minor_) - && cdr.read_ulong (tmp)) - { - this->completed_ = CORBA::CompletionStatus (tmp); - return; - } - - ACE_THROW (CORBA::MARSHAL ()); -} - -CORBA::ULong -CORBA::SystemException::_tao_errno (int errno_value) -{ - switch (errno_value) - { - case 0: - return TAO_UNSPECIFIED_MINOR_CODE; - case ETIMEDOUT: - return TAO_ETIMEDOUT_MINOR_CODE; - case ENFILE: - return TAO_ENFILE_MINOR_CODE; - case EPIPE: - return TAO_EPIPE_MINOR_CODE; - case ECONNREFUSED: - return TAO_ECONNREFUSED_MINOR_CODE; - case ENOENT: - return TAO_ENOENT_MINOR_CODE; - -#if !defined (ACE_HAS_WINCE) - case EMFILE: - return TAO_EMFILE_MINOR_CODE; - case EBADF: - return TAO_EBADF_MINOR_CODE; - case EPERM: - return TAO_EPERM_MINOR_CODE; - case EINVAL: - return TAO_EINVAL_MINOR_CODE; -#endif // ACE_HAS_WINCE - -#if (ENOSYS != EFAULT) - case ENOSYS: - return TAO_ENOSYS_MINOR_CODE; -#endif /* ENOSYS != EFAULT */ - case EAFNOSUPPORT: - return TAO_EAFNOSUPPORT_MINOR_CODE; - case EAGAIN: - return TAO_EAGAIN_MINOR_CODE; - case ENOMEM: - return TAO_ENOMEM_MINOR_CODE; - case EACCES: - return TAO_EACCES_MINOR_CODE; - case EFAULT: - return TAO_EFAULT_MINOR_CODE; - case EBUSY: - return TAO_EBUSY_MINOR_CODE; - case EEXIST: - return TAO_EEXIST_MINOR_CODE; - case ECOMM: - return TAO_ECOMM_MINOR_CODE; - case ECONNRESET: - return TAO_ECONNRESET_MINOR_CODE; -#if (ENOTSUP != ENOSYS) - case ENOTSUP: - return TAO_ENOTSUP_MINOR_CODE; -#endif /* ENOSYS != EFAULT */ - default: - // Mask off bottom 7 bits and return them. - return errno_value & 0x7FU; - } -} - -CORBA::ULong -CORBA::SystemException::_tao_minor_code (u_int location, - int errno_value) -{ - return - TAO::VMCID - | location - | _tao_errno (errno_value); -} - -void -CORBA::SystemException::_tao_print_system_exception (FILE *) const -{ - ACE_DEBUG ((LM_ERROR, - ACE_TEXT("(%P|%t) system exception, ID '%s'\n"), - ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); -} - -ACE_CString -CORBA::SystemException::_info (void) const -{ - // @@ there are a few other "user exceptions" in the CORBA scope, - // they're not all standard/system exceptions ... really need to - // either compare exhaustively against all those IDs (yeech) or - // (preferably) to represent the exception type directly in the - // exception value so it can be queried. - - ACE_CString info = "system exception, ID '"; - info += this->_rep_id (); - info += "'\n"; - - /// Mask off the lower order 12 bits to get the VMCID. - const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u; - - if (VMCID == TAO::VMCID) - { - // @@ Move the following code to a subroutine, it is too long already! - const char *location; - switch (this->minor () & 0x00000F80u) - { - case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE: - location = "location forward failed"; - break; - case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: - location = "send request failed"; - break; - case TAO_POA_DISCARDING: - location = "poa in discarding state"; - break; - case TAO_POA_HOLDING: - location = "poa in holding state"; - break; - case TAO_POA_INACTIVE: - location = "poa in inactive state"; - break; - case TAO_UNHANDLED_SERVER_CXX_EXCEPTION: - location = "unhandled c++ exception in server side"; - break; - case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE: - location = "failed to recv request response"; - break; - case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL: - location = "all protocols failed to parse the IOR"; - break; - case TAO_MPROFILE_CREATION_ERROR: - location = "error during MProfile creation"; - break; - case TAO_TIMEOUT_CONNECT_MINOR_CODE: - location = "timeout during connect"; - break; - case TAO_TIMEOUT_SEND_MINOR_CODE: - location = "timeout during send"; - break; - case TAO_TIMEOUT_RECV_MINOR_CODE: - location = "timeout during recv"; - break; - case TAO_IMPLREPO_MINOR_CODE: - location = "implrepo server exception"; - break; - case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE: - location = "endpoint initialization failure in Acceptor Registry"; - break; - case TAO_ORB_CORE_INIT_LOCATION_CODE: - location = "ORB Core initialization failed"; - break; - case TAO_POLICY_NARROW_CODE: - location = "Failure when narrowing a Policy"; - break; - case TAO_GUARD_FAILURE: - location = "Failure when trying to acquire a guard/monitor"; - break; - case TAO_POA_BEING_DESTROYED: - location = "POA has been destroyed or is currently being destroyed"; - break; - case TAO_AMH_REPLY_LOCATION_CODE: - location = "Failure when trying to send AMH reply"; - break; - case TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE: - location = "Failure in thread creation for RTCORBA thread pool"; - break; - default: - location = "unknown location"; - } - - const char *errno_indication; - char unknown_errno [255]; - CORBA::ULong minor_code = this->minor () & 0x7FU; - switch (minor_code) - { - case TAO_UNSPECIFIED_MINOR_CODE: - errno_indication = "unspecified errno"; - break; - case TAO_ETIMEDOUT_MINOR_CODE: - errno_indication = "ETIMEOUT"; - break; - case TAO_ENFILE_MINOR_CODE: - errno_indication = "ENFILE"; - break; - case TAO_EMFILE_MINOR_CODE: - errno_indication = "EMFILE"; - break; - case TAO_EPIPE_MINOR_CODE: - errno_indication = "EPIPE"; - break; - case TAO_ECONNREFUSED_MINOR_CODE: - errno_indication = "ECONNREFUSED"; - break; - case TAO_ENOENT_MINOR_CODE: - errno_indication = "ENOENT"; - break; - case TAO_EBADF_MINOR_CODE: - errno_indication = "EBADF"; - break; - case TAO_ENOSYS_MINOR_CODE: - errno_indication = "ENOSYS"; - break; - case TAO_EPERM_MINOR_CODE: - errno_indication = "EPERM"; - break; - case TAO_EAFNOSUPPORT_MINOR_CODE: - errno_indication = "EAFNOSUPPORT"; - break; - case TAO_EAGAIN_MINOR_CODE: - errno_indication = "EAGAIN"; - break; - case TAO_ENOMEM_MINOR_CODE: - errno_indication = "ENOMEM"; - break; - case TAO_EACCES_MINOR_CODE: - errno_indication = "EACCES"; - break; - case TAO_EFAULT_MINOR_CODE: - errno_indication = "EFAULT"; - break; - case TAO_EBUSY_MINOR_CODE: - errno_indication = "EBUSY"; - break; - case TAO_EEXIST_MINOR_CODE: - errno_indication = "EEXIST"; - break; - case TAO_EINVAL_MINOR_CODE: - errno_indication = "EINVAL"; - break; - case TAO_ECOMM_MINOR_CODE: - errno_indication = "ECOMM"; - break; - case TAO_ECONNRESET_MINOR_CODE: - errno_indication = "ECONNRESET"; - break; - case TAO_ENOTSUP_MINOR_CODE: - errno_indication = "ENOTSUP"; - break; - default: - { - // 7 bits of some other errno. - ACE_OS::sprintf (unknown_errno, - "low 7 bits of errno: %3u %s", - minor_code, ACE_OS::strerror (minor_code)); - - errno_indication = unknown_errno; - } - } - - char buffer[BUFSIZ]; - ACE_OS::sprintf (buffer, - "TAO exception, " - "minor code = %x (%s; %s), " - "completed = %s\n", - minor_code, - location, - errno_indication, - (completed () == CORBA::COMPLETED_YES) ? "YES" : - (completed () == CORBA::COMPLETED_NO) ? "NO" : - (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : - "garbage"); - - info += buffer; - } - else if (VMCID == CORBA::OMGVMCID) - { - const CORBA::ULong minor_code = this->minor () & 0xFFFU; - - const char *minor_description = 0; - - if (minor_code > 0) - minor_description = - CORBA::SystemException::_tao_get_omg_exception_description ( - *this, - minor_code); - else - minor_description = "*unknown description*"; - - char buffer[BUFSIZ]; - ACE_OS::sprintf (buffer, - "OMG minor code (%d), " - "described as '%s', " - "completed = %s\n", - minor_code, - minor_description, - (completed () == CORBA::COMPLETED_YES) ? "YES" : - (completed () == CORBA::COMPLETED_NO) ? "NO" : - (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : - "garbage"); - - info += buffer; - } - else - { - char buffer[BUFSIZ]; - ACE_OS::sprintf (buffer, - "Unknown vendor minor code id (%x), " - "minor code = %x, completed = %s\n", - VMCID, - this->minor (), // Use the raw minor code - (completed () == CORBA::COMPLETED_YES) ? "YES" : - (completed () == CORBA::COMPLETED_NO) ? "NO" : - (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : - "garbage"); - - info += buffer; - } - - return info; -} - -const char * -CORBA::SystemException::_tao_get_omg_exception_description ( - const CORBA::SystemException &exc, - CORBA::ULong minor_code) -{ -#ifndef ACE_NDEBUG - - static const char *UNKNOWN_TABLE[] = - { - "Unlisted user exception received by client.", // 1 - "Non-standard SystemException not supported.", // 2 - "An unkown user exception received by a portable interceptor." // 3 - }; - - static const char *BAD_PARAM_TABLE[] = - { - "Failure to register, unregister, or lookup value factory.", // 1 - "RID already defined in IFR.", // 2 - "Name already used in the context in IFR.", // 3 - "Target is not a valid container.", // 4 - "Name clash in inherited context.", // 5 - "Incorrect type for abstract interface.", // 6 - "string_to_object conversion failed due to a bad scheme name.", // 7 - "string_to_object conversion failed due to a bad address.", // 8 - "string_to_object conversion failed due to a bad schema specific part.",// 9 - "string_to_object conversion failed due to non specific reason.", // 10 - "Attempt to derive abstract interface from non-abstract base interface in the Interface Repository.", // 11 - "Attempt to let a ValueDef support more than one non-abstract interface in the Interface Repository.", // 12 - "Attempt to use an incomplete TypeCode as a parameter.", // 13 - "Invalid object id passed to POA::create_reference_by_id.", // 14 - "Bad name argument in TypeCode operation.", // 15 - "Bad RepositoryId argument in TypeCode operation.", // 16 - "Invalid member namein TypeCode operation.", // 17 - "Duplicate label value in create_union_tc.", // 18 - "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19 - "Supplied discriminator type illegitimate in create_union_tc.", // 20 - "Any passed to ServerRequest::set_exception does not contain an exception.", // 21 - "Unlisted user exception passed to ServerRequest::set_exception", // 22 - "wchar transmission code set not in service context.", // 23 - "Service context is not in OMG-defined range.", // 24 - "Enum value out of range.", // 25 - "Invalid service context Id in portable interceptor.", // 26 - "Attempt to call register_initial_reference with a null Object.", // 27 - "Invalid component Id in portable interceptor.", // 28 - "Invalid profile Id in portable interceptor.", // 29 - "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30 - "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31 - "DII asked to create request for an implicit operation.", // 32, - "An OTS/XA integration xa_ call returned XAER_INVAL.", // 33 - "Union branch modifier called with bad case label discriminator.", // 34 - "Illegal IDL context property name.", // 35 - "Illegal IDL property search string.", // 36 - "Illegal IDL context name.", // 37 - "Non-empty IDL context.", // 38 - "Servant not found [ServantManager].", // 39 - "ORB output stream does not support ValueOutputStream interface.", // 40 - "ORB input stream does not support ValueInputStream interface." // 41 - }; - - static const char *IMP_LIMIT_TABLE[] = - { - "Unable to use any profile in IOR." // 1 - }; - - static const char *INITIALIZE_TABLE[] = - { - "Priority range too restricted for ORB." // 1 - }; - - - static const char *INV_OBJREF_TABLE[] = - { - "wchar Code Set support not specified.", // 1 - "Codeset component required for type using wchar or wstring data." // 2 - }; - - static const char *MARSHAL_TABLE[] = - { - "Unable to locate value factory.", // 1 - "ServerRequest::set_result called before ServerRequest::ctx when the operation IDL contains a context clause.", // 2 - "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3 - "Attempt to marshal Local object.", // 4 - "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5 - "wchar or wstring data erroneously returned by server over GIOP 1.0 connection." //6 - "Unsupported RMI/IDL custom value type stream format." // 7 - }; - - static const char *BAD_TYPECODE_TABLE[] = - { - "Attempt to marshal incomplete TypeCode.", // 1 - "Member type code illegitimate in TypeCode operation.", // 2 - "Illegal parameter type." // 3 - }; - - static const char *NO_IMPLEMENT_TABLE[] = - { - "Missing local value implementation.", // 1 - "Incompatible value implementation version.", // 2 - "Unable to use any profile in IOR.", // 3 - "Attempt to use DII on Local object.", // 4 - "Biomolecular Sequence Analysis iterator cannot be reset.", // 5 - "Biomolecular Sequence Analysis metadata is not available as XML.", // 6 - "Genomic Maps iterator cannot be rest." // 7 - }; - - static const char *NO_RESOURCE_TABLE[] = - { - "Portable Interceptor operation not support in this binding.", // 1 - "No connection for request's priority." // 2 - }; - - static const char *BAD_INV_ORDER_TABLE[] = - { - "Dependency exists in IFR preventing destruction of this object", // 1 - "Attempt to destroy indestructible objects in IFR.", // 2 - "Operation would deadlock.", // 3 - "ORB has shutdown.", // 4 - "Attempt to invoke \"send\" or \"invoke\" operation of the same \"Request\" object more than once.", // 5 - "Attempt to set a servant manager after one has already been set.", // 6 - "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7 - "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8 - "ServerRequest::result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9 - "Attempt to send a DII request after it was sent previously.", // 10 - "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11 - "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12 - "Attempt to poll a synchronous DII request or to retrieve results from a synchronous DII request.", // 13 - "Invalid portable interceptor call", // 14 - "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15 - "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16 - "POA cannot create POAs while undergoing destruction." // 17 - }; - - static const char *TRANSIENT_TABLE[] = - { - "Request discarded due to resource exhaustion in POA, or because POA is in discarding state.", // 1 - "No usable profile in IOR.", // 2 - "Request cancelled.", // 3 - "POA destroyed." // 4 - }; - - static const char *OBJ_ADAPTER_TABLE[] = - { - "System exception in POA::unknown_adapter.", // 1 - "Incorrect servant type returned by servant manager", // 2 - "No default servant available [POA policy].", // 3 - "No servant manager available [POA policy].", // 4 - "Violation of POA policy by ServantActivator::incarnate.",// 5 - "Exception in PortableInterceptor::IORInterceptor::components_established.", // 6 - "Null servant returned by servant manager." // 7 - }; - - static const char *DATA_CONVERSION_TABLE[] = - { - "Character does not map to negotiated transmission code set.", // 1 - "Failure of PriorityMapping object." // 2 - }; - - static const char *OBJECT_NOT_EXIST_TABLE[] = - { - "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1 - "POAManager::incarnate failed to create POA." // 2 - }; - - static const char *INV_POLICY_TABLE[] = - { - "Unable to reconcile IOR specified policy with the effective policy override." // 1 - "Invalid PolicyType.", // 2 - "No PolicyFactory has been registered for the given PolicyType." // 3 - }; - - if (minor_code == 0) - return "*unknown description*"; - - minor_code--; // Adjust to match table offset. - - if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0") - && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *)) - return UNKNOWN_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0") - && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *)) - return BAD_PARAM_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0") - && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *)) - return IMP_LIMIT_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0") - && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *)) - return INITIALIZE_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0") - && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *)) - return INV_OBJREF_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0") - && minor_code < sizeof MARSHAL_TABLE / sizeof (char *)) - return MARSHAL_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0") - && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *)) - return BAD_TYPECODE_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0") - && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *)) - return NO_IMPLEMENT_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0") - && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *)) - return NO_RESOURCE_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0") - && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *)) - return BAD_INV_ORDER_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0") - && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *)) - return TRANSIENT_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") - && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *)) - return OBJ_ADAPTER_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0") - && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *)) - return DATA_CONVERSION_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") - && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *)) - return OBJECT_NOT_EXIST_TABLE[minor_code]; - - if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0") - && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *)) - return INV_POLICY_TABLE[minor_code]; - -#else - ACE_UNUSED_ARG (exc); - ACE_UNUSED_ARG (minor_code); -#endif /* !ACE_NDEBUG */ - - return "*unknown description*"; -} - -// Note that "buffer" holds the (unscoped) name originally, and is -// then overwritten. - -void -TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp - ACE_ENV_ARG_DECL) -{ - // Create the TypeCode for the CORBA::UnknownUserException. - TAO_OutputCDR stream (0, - ACE_CDR_BYTE_ORDER, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); - - static const char * interface_id = - "IDL:omg.org/CORBA/UnknownUserException:1.0"; - static const char * name = "UnknownUserException"; - static const char * field_name = "exception"; - - const CORBA::Boolean result = - (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 - || stream.write_string (interface_id) == 0 - || stream.write_string (name) == 0 - || stream.write_ulong (1L) == 0 - || stream.write_string (field_name) == 0); - - if (result) - ACE_THROW (CORBA::INITIALIZE ()); - - if (!(stream << CORBA::_tc_any)) - ACE_THROW (CORBA::INITIALIZE ()); - - ACE_NEW_THROW_EX (tcp, - CORBA::TypeCode (CORBA::tk_except, - stream.length (), - stream.buffer (), - 1, - sizeof (CORBA::UserException)), - CORBA::INITIALIZE ()); -} - -void -TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, - const char *name, - char *buffer, - size_t buflen - ACE_ENV_ARG_DECL) -{ - // This function must only be called ONCE, and with a global lock - // held! The <CORBA::ORB_init> method is responsible for ensuring - // this. - static const char *minor = "minor"; - static const char *completed = "completed"; - - // Create a CDR stream ... juggle the alignment here a bit, we know - // it's good enough for the typecode. - -#if defined(ACE_MVS) - // @@ We need to use a translator to make sure that all TypeCodes - // are stored in ISO8859 form, the problem is that this hack does - // not scale as more native sets have to be supported - - ACE_IBM1047_ISO8859 translator; - TAO_OutputCDR stream (buffer, - buflen, - ACE_CDR_BYTE_ORDER, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, - &translator); -#else - TAO_OutputCDR stream (buffer, - buflen, - ACE_CDR_BYTE_ORDER, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - TAO_Exceptions::global_allocator_, - ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); -#endif /* ACE_MVS */ - - // into CDR stream, stuff (in order): - // - byte order flag [4 bytes] - // - exception ID [27 + N bytes] - // - exception name [4 + N bytes ] - // - number of members (2) [4 bytes ] - // - foreach member, { name string, typecode } [~40 bytes] - - static const char prefix[] = "IDL:omg.org/CORBA/"; - static const char suffix[] = ":1.0"; - char * full_id = - CORBA::string_alloc (sizeof prefix - + static_cast<CORBA::ULong> (ACE_OS::strlen (name)) - + sizeof suffix); - - CORBA::String_var safe_full_id = full_id; - - ACE_OS::strcpy (full_id, prefix); - ACE_OS::strcat (full_id, name); - ACE_OS::strcat (full_id, suffix); - - CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 - || stream.write_string (full_id) == 0 - || stream.write_string (name) == 0 - || stream.write_ulong (2L) != 1 - || stream.write_string (minor) == 0; - - result = result || !(stream << CORBA::_tc_ulong); - - (void) safe_full_id.out (); // No longer need the string - - result = result || stream.write_string (completed) == 0; - result = result || !(stream << TAO::TC_completion_status); - - if (result) - ACE_THROW (CORBA::INITIALIZE ()); - - // @@ It is possible to throw an exception at this point? - // What if the exception typecode has not been initialized yet? - - // OK, we stuffed the buffer we were given (or grew a bigger one; - // hope to avoid that during initialization). Now build and return - // a TypeCode, saving it away in the list of ones that the ORB will - // always accept as part of any operation response! - - ACE_NEW_THROW_EX (tcp, - CORBA::TypeCode (CORBA::tk_except, - stream.length (), - stream.buffer (), - 1, - sizeof (CORBA::SystemException)), - CORBA::INITIALIZE ()); - ACE_CHECK; - - ACE_ASSERT (tcp->length_ <= buflen); - return; -} - -#if defined (__Lynx__) - -// LynxOS uses macro THREAD_CANCELLED internally, so it must -// be undefined to avoid compilation errors -#if defined (THREAD_CANCELLED) -#undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ - -#endif /*__Lynx__ */ - - -// List of standard/system exceptions ... used to create static -// storage for their typecodes, then later to initialize that storage -// using the routine above. (It's just too painful to init these -// typecodes statically in all cases!) - -#define STANDARD_EXCEPTION_LIST \ - TAO_SYSTEM_EXCEPTION (UNKNOWN) \ - TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ - TAO_SYSTEM_EXCEPTION (NO_MEMORY) \ - TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \ - TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \ - TAO_SYSTEM_EXCEPTION (INV_OBJREF) \ - TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \ - TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \ - TAO_SYSTEM_EXCEPTION (INTERNAL) \ - TAO_SYSTEM_EXCEPTION (MARSHAL) \ - TAO_SYSTEM_EXCEPTION (INITIALIZE) \ - TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \ - TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \ - TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \ - TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \ - TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \ - TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \ - TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \ - TAO_SYSTEM_EXCEPTION (TRANSIENT) \ - TAO_SYSTEM_EXCEPTION (FREE_MEM) \ - TAO_SYSTEM_EXCEPTION (INV_IDENT) \ - TAO_SYSTEM_EXCEPTION (INV_FLAG) \ - TAO_SYSTEM_EXCEPTION (INTF_REPOS) \ - TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \ - TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \ - TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \ - TAO_SYSTEM_EXCEPTION (INV_POLICY) \ - TAO_SYSTEM_EXCEPTION (REBIND) \ - TAO_SYSTEM_EXCEPTION (TIMEOUT) \ - TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \ - TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \ - TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \ - TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \ - TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \ - TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \ - TAO_SYSTEM_EXCEPTION (BAD_QOS) \ - TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \ - TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \ - TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \ - TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) - -// Declare static storage for these ... the buffer is "naturally" -// aligned and overwritten. -// -// @@ this actually doesn't guarantee "natural" alignment, but -// it works that way in most systems. - -#define TAO_TC_BUF_LEN 256 - -static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; - -#define TAO_SYSTEM_EXCEPTION(name) \ - CORBA::TypeCode_ptr CORBA::_tc_ ## name = 0; - STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - - static CORBA::TypeCode_ptr *type_code_array [] = { -#define TAO_SYSTEM_EXCEPTION(name) \ - &CORBA::_tc_ ## name, - STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - &CORBA::_tc_null}; - -// Since we add an extra element subtract 1 -static const CORBA::ULong array_sz = - (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1; - -static const char *repo_id_array[] = { -#define TAO_SYSTEM_EXCEPTION(name) \ - (char *) "IDL:omg.org/CORBA/" #name ":1.0", - STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - 0 - }; - - -TAO::excp_factory excp_array [] = { -#define TAO_SYSTEM_EXCEPTION(name) \ - &CORBA::name::_tao_create, - STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - 0 - }; - -void -TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) -{ - // This routine should only be called once. - - // Not thread safe. Caller must provide synchronization. - - if (TAO_Exceptions::initialized_) - { - return; - } - - // Initialize the start up allocator. - ACE_NEW (TAO_Exceptions::global_allocator_, - ACE_New_Allocator); - - static const char *name_array[] = { -#define TAO_SYSTEM_EXCEPTION(name) \ - # name, - STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - 0 - }; - - for (CORBA::ULong i = 0; i < array_sz; ++i) - { - TAO_Exceptions::make_standard_typecode (*type_code_array[i], - name_array[i], - (char*) tc_buf_CORBA, - sizeof tc_buf_CORBA - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - } - - TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException - ACE_ENV_ARG_PARAMETER); - - TAO_Exceptions::initialized_ = true; -} - -#undef TAO_TC_BUF_LEN - - -CORBA::SystemException * -TAO_Exceptions::create_system_exception (const char *id - ACE_ENV_ARG_DECL_NOT_USED) -{ - for (CORBA::ULong i = 0; i < array_sz; ++i) - { - if (ACE_OS::strcmp (id, repo_id_array[i]) == 0) - return (*(excp_array[i])) (); - } - - return 0; -} - -void -TAO_Exceptions::fini (void) -{ - for (CORBA::ULong i = 0; i < array_sz; ++i) - { - CORBA::release (*type_code_array[i]); - *type_code_array[i] = 0; - } - - CORBA::release (CORBA::_tc_UnknownUserException); - CORBA::_tc_UnknownUserException = 0; - - delete TAO_Exceptions::global_allocator_; - TAO_Exceptions::global_allocator_ = 0; -} - -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::name * \ -CORBA::name ::_downcast (CORBA::Exception* exception) \ -{ \ - if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \ - return dynamic_cast<CORBA::name *> (exception); \ - return 0; \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -void \ -CORBA::name ::_raise (void) const \ -{ \ - TAO_RAISE (*this); \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -// SystemException constructors -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::name ::name (void) \ - : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ - #name, \ - TAO::VMCID, \ - CORBA::COMPLETED_NO) \ -{ \ -} \ -\ -CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \ - : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ - #name, \ - code, \ - completed) \ -{ \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::TypeCode_ptr \ -CORBA::name ::_type (void) const \ -{ \ - return CORBA::_tc_ ## name; \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -void \ -CORBA::name ::_tao_any_destructor (void *x) \ -{ \ - CORBA::name *tmp = static_cast<CORBA::name *> (x); \ - delete tmp; \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::Exception * \ -CORBA::name ::_tao_duplicate (void) const \ -{ \ - CORBA::Exception *result; \ - ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ - return result; \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::SystemException * \ -CORBA::name ::_tao_create (void) \ -{ \ - CORBA::name *result; \ - ACE_NEW_RETURN (result, CORBA::name (), 0); \ - return result; \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -void \ -CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ -{ \ - TAO::Any_SystemException::insert_copy ( \ - any, \ - CORBA::name ::_tao_any_destructor, \ - CORBA::_tc_ ## name, \ - ex \ - ); \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -void \ -CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \ -{ \ - TAO::Any_SystemException::insert ( \ - any, \ - CORBA::name ::_tao_any_destructor, \ - CORBA::_tc_ ## name, \ - ex \ - ); \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - -#define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::Boolean operator>>= (const CORBA::Any &any, \ - const CORBA::name *&ex) \ -{ \ - return \ - TAO::Any_SystemException::extract ( \ - any, \ - CORBA::name ::_tao_any_destructor, \ - CORBA::_tc_ ## name, \ - (const CORBA::SystemException *&) ex, \ - &CORBA::name ::_tao_create); \ -} - -STANDARD_EXCEPTION_LIST -#undef TAO_SYSTEM_EXCEPTION - - #if defined (TAO_DONT_CATCH_DOT_DOT_DOT) TAO_DONT_CATCH::TAO_DONT_CATCH (void) diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 76759a0e755..f0db1280c40 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -8,13 +8,13 @@ * * This file defines way in which CORBA exceptions are reported. * - * @author Copyright 1994-1995 by Sun Microsystems Inc. * @author DOC Group at Vanderbilt U., Wash U, and UCI */ //============================================================================= #ifndef TAO_EXCEPTION_H #define TAO_EXCEPTION_H + #include /**/ "ace/pre.h" // Do not try removing this. If you remove this for subsetting lots of @@ -32,11 +32,12 @@ #define TAO_RAISE(EXCEPTION) #endif /* ACE_HAS_EXCEPTIONS */ +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" +#include "tao/CORBA_String.h" #include "ace/SStringfwd.h" #include "ace/iosfwd.h" #include "ace/CORBA_macros.h" -#include "tao/TAO_Export.h" -#include "tao/Basic_Types.h" class ACE_Allocator; @@ -63,26 +64,26 @@ class TAO_InputCDR; namespace CORBA { class TypeCode; - typedef TypeCode *TypeCode_ptr; + typedef TypeCode * TypeCode_ptr; class Environment; class Any; - typedef Any *Any_ptr; - - enum CompletionStatus - { - // = Completion Status for System exceptions + typedef Any * Any_ptr; - COMPLETED_YES, // successful or exceptional completion - COMPLETED_NO, // didn't change any state; retry is OK - COMPLETED_MAYBE // can't say what happened; retry unsafe - }; + class SystemException; + /** + * @enum exception_type + * + * @brief Enumeration used to identify the type of CORBA exception. + * + * CORBA exceptions generally fall into two categories, user + * exceptions and system exceptions. This enumeration is used when + * identifying the type of CORBA exception. + */ enum exception_type { - // = Exception type. - NO_EXCEPTION, USER_EXCEPTION, SYSTEM_EXCEPTION @@ -96,25 +97,18 @@ namespace CORBA * @brief Exception * * CORBA2-specified exception hierarchy. All exceptions have a - * type (represented by a TypeCode) and a widely scoped type ID - * (in the TypeCode) that generated by any OMG-IDL compiler and - * available through the Interface Repositories. Think of it as a + * type (represented by a @c TypeCode) and a widely scoped type ID + * (in the @c TypeCode) that are generated by any OMG-IDL compiler + * and available through the Interface Repository. Think of it as a * "globally scoped" name distinguishing each exception. + * + * @todo According to the OMG CORBA C++ Mapping version 1.1, all + * constructors, copy constructors and assignment operators + * should be moved to "protected" section in class + * declarations. Since the current MS Visual C++ 6.0 compiler + * will cause some problems to TAO's exception mechanism, we + * defer doing this until we drop support for MSVC++ 6. */ - - /* NOTE: - According to the OMG CORBA C++ Mapping version 1.1, all - constructors, copy constructors and assignment operators - should be moved to "protected" section in class declarations - - Since the current MS Visual C++ 6.0 compiler will cause some - problems to TAO's exception mechanism, so we defer doing this until - we full migrate from VC 6.0 to VC 7.0 and higher version. - - This later change only affect the "Exception.h" file and won't - affect the "Exception.cpp" file. - */ - class TAO_Export Exception { public: @@ -148,12 +142,14 @@ namespace CORBA // = To implement the narrow method. virtual int _is_a (const char* repository_id) const; - /// Constructor from a respository id. + /// Construct from a respository id. Exception (const char *repository_id, const char *local_name); - /// Print the exception <ex> to output determined by <f>. This - /// function is not CORBA compliant. + /// Print the exception to output determined by @a f. + /** + * @note This method is TAO-specific. + */ void _tao_print_exception (const char *info, FILE *f = stdout) const; @@ -195,233 +191,19 @@ namespace CORBA virtual CORBA::Exception *_tao_duplicate (void) const = 0; protected: - /// Default constructor is protected. - Exception (void); - - private: - /// Storage of our repository id and local name. - char *id_; - char *name_; - }; - - /** - * @class UserException - * - * @brief User exceptions are those defined by application developers - * using OMG-IDL. - */ - class TAO_Export UserException : public Exception - { - public: - - /// Copy constructor. - UserException (const UserException &src); - - /// Destructor. - ~UserException (void); - - /// Assignment operator. - UserException &operator= (const UserException &src); - - /// The narrow operation. - static UserException *_downcast (CORBA::Exception *exception); - - /// The const version of narrow operation - static const UserException *_downcast (const CORBA::Exception *exception); - - virtual void _raise (void) const = 0; - - // = TAO specific extension. - - /// Constructor from a repository id. - UserException (const char *repository_id, - const char *local_name); - - virtual int _is_a (const char *interface_id) const; - - // Used for narrowing - - /// Returns a string containing information about the exception. This - /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; - //protected: /// Default constructor. - UserException (void); - }; - - - - /** - * @class SystemException - * - * @brief SystemException - * - * System exceptions are those defined in the CORBA spec; OMG-IDL - * defines these. - */ - class TAO_Export SystemException : public Exception - { - public: - /// Default constructtor - SystemException (void); - - - /// Copy constructor. - SystemException (const SystemException &src); - - /// Destructor. - ~SystemException (void); - - /// Assignment operator. - SystemException &operator= (const SystemException &src); - - /// Get the minor status. - ULong minor (void) const; - - /// Set the minor status. - void minor (ULong m); - - /// Get the completion status. - CORBA::CompletionStatus completed (void) const; - - /// Set the operation completion status. - void completed (CORBA::CompletionStatus c); - - /// Narrow to a SystemException. - static SystemException *_downcast (CORBA::Exception *exception); - - /// The const version of narrow operation to a SystemException - static const SystemException *_downcast(const CORBA::Exception *exception); - - virtual void _raise (void) const = 0; - - // = TAO-specific extension. - - /// Helper for the _downcast operation. - virtual int _is_a (const char *type_id) const; - - /// Print the system exception @c ex to output determined by @c f. - /// This function is not CORBA compliant. - void _tao_print_system_exception (FILE *f = stdout) const; - - /// Create an exception from the available exception - /// virtual CORBA::Exception *_tao_duplicate (void) const; - - /// Returns a string containing information about the exception. This - /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; - - virtual void _tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED) const; - virtual void _tao_decode (TAO_InputCDR &cdr - ACE_ENV_ARG_DECL_NOT_USED); - - /// Helper to create a minor status value. - static CORBA::ULong _tao_minor_code (u_int location, - int errno_value); - - /// Helper to translate a platform-specific errno to a TAO errno - /// value. - static CORBA::ULong _tao_errno (int errno_value); - - /// Overridden base class method to help compilers that use - /// explicit template instantiations going - virtual CORBA::Exception *_tao_duplicate (void) const {return 0;} - - protected: - - /// Constructor using a repository id. - SystemException (CORBA::ULong code, - CORBA::CompletionStatus completed); - - /// Constructor using a repository id. - SystemException (const char *repository_id, - const char *local_name, - CORBA::ULong code, - CORBA::CompletionStatus completed); - - /// Return the exception description associated with the given OMG - /// minor code. - static const char *_tao_get_omg_exception_description ( - const CORBA::SystemException &exc, - CORBA::ULong minor_code); + Exception (void); private: - /// Minor code. - CORBA::ULong minor_; - /// Completion status. - CORBA::CompletionStatus completed_; + /// Repository Id + CORBA::String_var id_; - }; + /// Local name. + CORBA::String_var name_; - // Declarations for all of the CORBA standard exceptions. - // - // @@ - shouldn't have a default minor code, at least for code that's - // inside the ORB. All minor codes should be symbolically catalogued. - -#define TAO_SYSTEM_EXCEPTION(name) \ - class TAO_Export name : public SystemException \ - { \ - public: \ - name (void); \ - name (CORBA::ULong code, \ - CORBA::CompletionStatus completed); \ - static name * _downcast (CORBA::Exception* exception); \ - virtual void _raise (void) const; \ - virtual CORBA::TypeCode_ptr _type (void) const; \ - static void _tao_any_destructor (void*); \ - virtual CORBA::Exception *_tao_duplicate (void) const; \ - static CORBA::SystemException *_tao_create (void); \ - }; \ - TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \ - TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \ - TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \ - const CORBA::name *&) - - TAO_SYSTEM_EXCEPTION(UNKNOWN); // the unknown exception - TAO_SYSTEM_EXCEPTION(BAD_PARAM); // an invalid parameter was passed - TAO_SYSTEM_EXCEPTION(NO_MEMORY); // memory allocation failure - TAO_SYSTEM_EXCEPTION(IMP_LIMIT); // violated implementation limit - TAO_SYSTEM_EXCEPTION(COMM_FAILURE); // communication failure - TAO_SYSTEM_EXCEPTION(INV_OBJREF); // invalid object reference - TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object - TAO_SYSTEM_EXCEPTION(NO_PERMISSION); // no permission for operation - TAO_SYSTEM_EXCEPTION(INTERNAL); // ORB internal error - TAO_SYSTEM_EXCEPTION(MARSHAL); // error marshaling param/result - TAO_SYSTEM_EXCEPTION(INITIALIZE); // ORB initialization failure - TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); // implementation unavailable - TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); // bad typecode - TAO_SYSTEM_EXCEPTION(BAD_OPERATION); // invalid operation - TAO_SYSTEM_EXCEPTION(NO_RESOURCES); // out of resources for request - TAO_SYSTEM_EXCEPTION(NO_RESPONSE); // response not yet available - TAO_SYSTEM_EXCEPTION(PERSIST_STORE); // persistent storage failure - TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); // routine invocations out of order - TAO_SYSTEM_EXCEPTION(TRANSIENT); // transient error, try again later - TAO_SYSTEM_EXCEPTION(FREE_MEM); // cannot free memory - TAO_SYSTEM_EXCEPTION(INV_IDENT); // invalid identifier syntax - TAO_SYSTEM_EXCEPTION(INV_FLAG); // invalid flag was specified - TAO_SYSTEM_EXCEPTION(INTF_REPOS); // interface repository unavailable - TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); // error processing context object - TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); // object adapter failure - TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); // data conversion error - TAO_SYSTEM_EXCEPTION(INV_POLICY); // invalid policies present - TAO_SYSTEM_EXCEPTION(REBIND); // rebind needed - TAO_SYSTEM_EXCEPTION(TIMEOUT); // operation timed out - TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction - TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); // invalid transaction mode - TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); // operation needs transaction - TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); // operation was a no-op - TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); // invalid TP context passed - TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); // incompatible code set - TAO_SYSTEM_EXCEPTION(BAD_QOS); // bad quality of service - TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); - TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); - TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); - TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); - -#undef TAO_SYSTEM_EXCEPTION + }; #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -461,7 +243,7 @@ public: ACE_ENV_ARG_DECL); /// Runtime initialization of all standard exception typecodes. - /// Called from <CORBA::ORB_init>. + /// Called from @c CORBA::ORB_init. static void init (ACE_ENV_SINGLE_ARG_DECL); /// Runtime finalization of all standard exception typecodes. @@ -509,4 +291,5 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *); #endif /* __ACE_INLINE__ */ #include /**/"ace/post.h" + #endif /* TAO_EXCEPTION_H */ diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 56bf7a1e6a9..7fc06f9f2ad 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -2,38 +2,8 @@ // // $Id$ -ACE_INLINE CORBA::Exception* -CORBA::Exception::_downcast (CORBA::Exception* x) +ACE_INLINE CORBA::Exception * +CORBA::Exception::_downcast (CORBA::Exception * x) { return x; } - -ACE_INLINE -CORBA::UserException::UserException (const CORBA::UserException &src) - : CORBA::Exception (src) -{ -} - -ACE_INLINE CORBA::ULong -CORBA::SystemException::minor (void) const -{ - return this->minor_; -} - -ACE_INLINE void -CORBA::SystemException::minor (CORBA::ULong m) -{ - this->minor_ = m; -} - -ACE_INLINE CORBA::CompletionStatus -CORBA::SystemException::completed (void) const -{ - return this->completed_; -} - -ACE_INLINE void -CORBA::SystemException::completed (CORBA::CompletionStatus c) -{ - this->completed_ = c; -} diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 9f5940e3a06..4d02a03d3bf 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -98,10 +98,10 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param ( // ============================================================ -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> CORBA::Boolean TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( @@ -111,7 +111,7 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; S_slice * tmp_ptr = 0; ACE_ALLOCATOR_RETURN (tmp_ptr, - ARRAY_TRAITS::tao_alloc (), + ARRAY_TRAITS::alloc (), 0); this->x_ = tmp_ptr; S_forany tmp (this->x_.ptr ()); @@ -120,10 +120,10 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 -template<typename S, - typename S_slice, - typename S_var, - typename S_forany, +template<typename S, + typename S_slice, + typename S_var, + typename S_forany, typename S_tag> void TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>:: diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 9a3fa7af8a8..dfdd5db0474 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -11,15 +11,18 @@ #include "LF_Strategy.h" #include "Request_Dispatcher.h" #include "Codeset_Manager.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "GIOP_Message_Base.i" #endif /* __ACE_INLINE__ */ + ACE_RCSID (tao, GIOP_Message_Base, "$Id$") + TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core, size_t /*input_cdr_size*/) : orb_core_ (orb_core) @@ -903,7 +906,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); request_id = request.request_id (); @@ -1094,7 +1097,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } @@ -1123,7 +1126,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index eef8198c352..8f844d1437b 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_Operation_Details; class TAO_Target_Specification; diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 0166a4baa2c..eae1ef62b41 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -9,6 +9,7 @@ #include "tao/TAO_Server_Request.h" #include "tao/ORB_Constants.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index e9cddab3989..344e84a3388 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -13,15 +13,18 @@ #include "Transport.h" #include "Transport_Mux_Strategy.h" #include "Codeset_Manager.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Lite.i" #endif /* __ACE_INLINE__ */ + ACE_RCSID (tao, GIOP_Message_Lite, "$Id$") + static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; @@ -737,7 +740,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, // Throw an exception if the if (parse_error != 0) - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); request_id = request.request_id (); @@ -922,7 +925,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } @@ -958,7 +961,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, if (parse_error != 0) { - ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_TRY_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 54c9ff7aea0..3393e074da0 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -24,7 +24,7 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" #include "tao/CDR.h" class TAO_Operation_Details; diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index a2e550c60c8..78ed2bb2abf 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -616,7 +616,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IRObject_ptr -TAO::Objref_Traits<CORBA::IRObject>::tao_duplicate ( +TAO::Objref_Traits<CORBA::IRObject>::duplicate ( CORBA::IRObject_ptr p ) { @@ -625,7 +625,7 @@ TAO::Objref_Traits<CORBA::IRObject>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::IRObject>::tao_release ( +TAO::Objref_Traits<CORBA::IRObject>::release ( CORBA::IRObject_ptr p ) { @@ -634,14 +634,14 @@ TAO::Objref_Traits<CORBA::IRObject>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IRObject_ptr -TAO::Objref_Traits<CORBA::IRObject>::tao_nil (void) +TAO::Objref_Traits<CORBA::IRObject>::nil (void) { return CORBA::IRObject::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::IRObject>::tao_marshal ( +TAO::Objref_Traits<CORBA::IRObject>::marshal ( CORBA::IRObject_ptr p, TAO_OutputCDR & cdr ) @@ -851,7 +851,7 @@ CORBA::IRObject::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Contained_ptr -TAO::Objref_Traits<CORBA::Contained>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Contained>::duplicate ( CORBA::Contained_ptr p ) { @@ -860,7 +860,7 @@ TAO::Objref_Traits<CORBA::Contained>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Contained>::tao_release ( +TAO::Objref_Traits<CORBA::Contained>::release ( CORBA::Contained_ptr p ) { @@ -869,14 +869,14 @@ TAO::Objref_Traits<CORBA::Contained>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Contained_ptr -TAO::Objref_Traits<CORBA::Contained>::tao_nil (void) +TAO::Objref_Traits<CORBA::Contained>::nil (void) { return CORBA::Contained::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Contained>::tao_marshal ( +TAO::Objref_Traits<CORBA::Contained>::marshal ( CORBA::Contained_ptr p, TAO_OutputCDR & cdr ) @@ -2376,7 +2376,7 @@ void CORBA::EnumMemberSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Container_ptr -TAO::Objref_Traits<CORBA::Container>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Container>::duplicate ( CORBA::Container_ptr p ) { @@ -2385,7 +2385,7 @@ TAO::Objref_Traits<CORBA::Container>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Container>::tao_release ( +TAO::Objref_Traits<CORBA::Container>::release ( CORBA::Container_ptr p ) { @@ -2394,14 +2394,14 @@ TAO::Objref_Traits<CORBA::Container>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Container_ptr -TAO::Objref_Traits<CORBA::Container>::tao_nil (void) +TAO::Objref_Traits<CORBA::Container>::nil (void) { return CORBA::Container::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Container>::tao_marshal ( +TAO::Objref_Traits<CORBA::Container>::marshal ( CORBA::Container_ptr p, TAO_OutputCDR & cdr ) @@ -3591,7 +3591,7 @@ CORBA::Container::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IDLType_ptr -TAO::Objref_Traits<CORBA::IDLType>::tao_duplicate ( +TAO::Objref_Traits<CORBA::IDLType>::duplicate ( CORBA::IDLType_ptr p ) { @@ -3600,7 +3600,7 @@ TAO::Objref_Traits<CORBA::IDLType>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::IDLType>::tao_release ( +TAO::Objref_Traits<CORBA::IDLType>::release ( CORBA::IDLType_ptr p ) { @@ -3609,14 +3609,14 @@ TAO::Objref_Traits<CORBA::IDLType>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::IDLType_ptr -TAO::Objref_Traits<CORBA::IDLType>::tao_nil (void) +TAO::Objref_Traits<CORBA::IDLType>::nil (void) { return CORBA::IDLType::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::IDLType>::tao_marshal ( +TAO::Objref_Traits<CORBA::IDLType>::marshal ( CORBA::IDLType_ptr p, TAO_OutputCDR & cdr ) @@ -3792,7 +3792,7 @@ CORBA::IDLType::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypedefDef_ptr -TAO::Objref_Traits<CORBA::TypedefDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::TypedefDef>::duplicate ( CORBA::TypedefDef_ptr p ) { @@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::TypedefDef>::tao_release ( +TAO::Objref_Traits<CORBA::TypedefDef>::release ( CORBA::TypedefDef_ptr p ) { @@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::TypedefDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::TypedefDef_ptr -TAO::Objref_Traits<CORBA::TypedefDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::TypedefDef>::nil (void) { return CORBA::TypedefDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::TypedefDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::TypedefDef>::marshal ( CORBA::TypedefDef_ptr p, TAO_OutputCDR & cdr ) @@ -4104,7 +4104,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4179,7 +4179,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::ValueDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4254,7 +4254,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4329,7 +4329,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4404,7 +4404,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4479,7 +4479,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4554,7 +4554,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } @@ -4629,7 +4629,7 @@ CORBA::Boolean operator<< ( for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal ( + TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( _tao_sequence[i].in (), strm ); } diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 7df03151ae5..b7caaf9c9ce 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -2776,14 +2776,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::IRObject> { - static CORBA::IRObject_ptr tao_duplicate ( + static CORBA::IRObject_ptr duplicate ( CORBA::IRObject_ptr ); - static void tao_release ( + static void release ( CORBA::IRObject_ptr ); - static CORBA::IRObject_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::IRObject_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::IRObject_ptr p, TAO_OutputCDR & cdr ); @@ -2797,14 +2797,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Contained> { - static CORBA::Contained_ptr tao_duplicate ( + static CORBA::Contained_ptr duplicate ( CORBA::Contained_ptr ); - static void tao_release ( + static void release ( CORBA::Contained_ptr ); - static CORBA::Contained_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Contained_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Contained_ptr p, TAO_OutputCDR & cdr ); @@ -2818,14 +2818,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository> { - static CORBA::Repository_ptr tao_duplicate ( + static CORBA::Repository_ptr duplicate ( CORBA::Repository_ptr ); - static void tao_release ( + static void release ( CORBA::Repository_ptr ); - static CORBA::Repository_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Repository_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -2839,14 +2839,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Container> { - static CORBA::Container_ptr tao_duplicate ( + static CORBA::Container_ptr duplicate ( CORBA::Container_ptr ); - static void tao_release ( + static void release ( CORBA::Container_ptr ); - static CORBA::Container_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Container_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Container_ptr p, TAO_OutputCDR & cdr ); @@ -2860,14 +2860,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef> { - static CORBA::ModuleDef_ptr tao_duplicate ( + static CORBA::ModuleDef_ptr duplicate ( CORBA::ModuleDef_ptr ); - static void tao_release ( + static void release ( CORBA::ModuleDef_ptr ); - static CORBA::ModuleDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ModuleDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -2881,14 +2881,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef> { - static CORBA::ConstantDef_ptr tao_duplicate ( + static CORBA::ConstantDef_ptr duplicate ( CORBA::ConstantDef_ptr ); - static void tao_release ( + static void release ( CORBA::ConstantDef_ptr ); - static CORBA::ConstantDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ConstantDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ); @@ -2902,14 +2902,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::IDLType> { - static CORBA::IDLType_ptr tao_duplicate ( + static CORBA::IDLType_ptr duplicate ( CORBA::IDLType_ptr ); - static void tao_release ( + static void release ( CORBA::IDLType_ptr ); - static CORBA::IDLType_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::IDLType_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::IDLType_ptr p, TAO_OutputCDR & cdr ); @@ -2923,14 +2923,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef> { - static CORBA::StructDef_ptr tao_duplicate ( + static CORBA::StructDef_ptr duplicate ( CORBA::StructDef_ptr ); - static void tao_release ( + static void release ( CORBA::StructDef_ptr ); - static CORBA::StructDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::StructDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ); @@ -2944,14 +2944,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef> { - static CORBA::UnionDef_ptr tao_duplicate ( + static CORBA::UnionDef_ptr duplicate ( CORBA::UnionDef_ptr ); - static void tao_release ( + static void release ( CORBA::UnionDef_ptr ); - static CORBA::UnionDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::UnionDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ); @@ -2965,14 +2965,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef> { - static CORBA::EnumDef_ptr tao_duplicate ( + static CORBA::EnumDef_ptr duplicate ( CORBA::EnumDef_ptr ); - static void tao_release ( + static void release ( CORBA::EnumDef_ptr ); - static CORBA::EnumDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::EnumDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ); @@ -2986,14 +2986,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef> { - static CORBA::AliasDef_ptr tao_duplicate ( + static CORBA::AliasDef_ptr duplicate ( CORBA::AliasDef_ptr ); - static void tao_release ( + static void release ( CORBA::AliasDef_ptr ); - static CORBA::AliasDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::AliasDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ); @@ -3007,14 +3007,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef> { - static CORBA::InterfaceDef_ptr tao_duplicate ( + static CORBA::InterfaceDef_ptr duplicate ( CORBA::InterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::InterfaceDef_ptr ); - static CORBA::InterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::InterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3028,14 +3028,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef> { - static CORBA::ExceptionDef_ptr tao_duplicate ( + static CORBA::ExceptionDef_ptr duplicate ( CORBA::ExceptionDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExceptionDef_ptr ); - static CORBA::ExceptionDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExceptionDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ); @@ -3049,14 +3049,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef> { - static CORBA::NativeDef_ptr tao_duplicate ( + static CORBA::NativeDef_ptr duplicate ( CORBA::NativeDef_ptr ); - static void tao_release ( + static void release ( CORBA::NativeDef_ptr ); - static CORBA::NativeDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::NativeDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ); @@ -3070,14 +3070,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef> { - static CORBA::ValueDef_ptr tao_duplicate ( + static CORBA::ValueDef_ptr duplicate ( CORBA::ValueDef_ptr ); - static void tao_release ( + static void release ( CORBA::ValueDef_ptr ); - static CORBA::ValueDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ValueDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -3091,14 +3091,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef> { - static CORBA::ValueBoxDef_ptr tao_duplicate ( + static CORBA::ValueBoxDef_ptr duplicate ( CORBA::ValueBoxDef_ptr ); - static void tao_release ( + static void release ( CORBA::ValueBoxDef_ptr ); - static CORBA::ValueBoxDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ValueBoxDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ); @@ -3112,14 +3112,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef> { - static CORBA::AbstractInterfaceDef_ptr tao_duplicate ( + static CORBA::AbstractInterfaceDef_ptr duplicate ( CORBA::AbstractInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::AbstractInterfaceDef_ptr ); - static CORBA::AbstractInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::AbstractInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3133,14 +3133,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef> { - static CORBA::LocalInterfaceDef_ptr tao_duplicate ( + static CORBA::LocalInterfaceDef_ptr duplicate ( CORBA::LocalInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::LocalInterfaceDef_ptr ); - static CORBA::LocalInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::LocalInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3154,14 +3154,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef> { - static CORBA::ExtInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtInterfaceDef_ptr duplicate ( CORBA::ExtInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtInterfaceDef_ptr ); - static CORBA::ExtInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3175,14 +3175,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef> { - static CORBA::ExtValueDef_ptr tao_duplicate ( + static CORBA::ExtValueDef_ptr duplicate ( CORBA::ExtValueDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtValueDef_ptr ); - static CORBA::ExtValueDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtValueDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -3196,14 +3196,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef> { - static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtAbstractInterfaceDef_ptr duplicate ( CORBA::ExtAbstractInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtAbstractInterfaceDef_ptr ); - static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtAbstractInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3217,14 +3217,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef> { - static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtLocalInterfaceDef_ptr duplicate ( CORBA::ExtLocalInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtLocalInterfaceDef_ptr ); - static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtLocalInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -3238,14 +3238,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::TypedefDef> { - static CORBA::TypedefDef_ptr tao_duplicate ( + static CORBA::TypedefDef_ptr duplicate ( CORBA::TypedefDef_ptr ); - static void tao_release ( + static void release ( CORBA::TypedefDef_ptr ); - static CORBA::TypedefDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::TypedefDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::TypedefDef_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index b3dbdb30acc..b1b8ba7ad3e 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -658,7 +658,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Repository_ptr -TAO::Objref_Traits<CORBA::Repository>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Repository>::duplicate ( CORBA::Repository_ptr p ) { @@ -667,7 +667,7 @@ TAO::Objref_Traits<CORBA::Repository>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Repository>::tao_release ( +TAO::Objref_Traits<CORBA::Repository>::release ( CORBA::Repository_ptr p ) { @@ -676,14 +676,14 @@ TAO::Objref_Traits<CORBA::Repository>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Repository_ptr -TAO::Objref_Traits<CORBA::Repository>::tao_nil (void) +TAO::Objref_Traits<CORBA::Repository>::nil (void) { return CORBA::Repository::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Repository>::tao_marshal ( +TAO::Objref_Traits<CORBA::Repository>::marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ) @@ -1190,7 +1190,7 @@ CORBA::Repository::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ModuleDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ModuleDef>::duplicate ( CORBA::ModuleDef_ptr p ) { @@ -1199,7 +1199,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ModuleDef>::tao_release ( +TAO::Objref_Traits<CORBA::ModuleDef>::release ( CORBA::ModuleDef_ptr p ) { @@ -1208,14 +1208,14 @@ TAO::Objref_Traits<CORBA::ModuleDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ModuleDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ModuleDef>::nil (void) { return CORBA::ModuleDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ModuleDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ModuleDef>::marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ) @@ -1371,7 +1371,7 @@ CORBA::ModuleDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstantDef_ptr -TAO::Objref_Traits<CORBA::ConstantDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ConstantDef>::duplicate ( CORBA::ConstantDef_ptr p ) { @@ -1380,7 +1380,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ConstantDef>::tao_release ( +TAO::Objref_Traits<CORBA::ConstantDef>::release ( CORBA::ConstantDef_ptr p ) { @@ -1389,14 +1389,14 @@ TAO::Objref_Traits<CORBA::ConstantDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ConstantDef_ptr -TAO::Objref_Traits<CORBA::ConstantDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ConstantDef>::nil (void) { return CORBA::ConstantDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ConstantDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ConstantDef>::marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ) @@ -1759,7 +1759,7 @@ CORBA::ConstantDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StructDef_ptr -TAO::Objref_Traits<CORBA::StructDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::StructDef>::duplicate ( CORBA::StructDef_ptr p ) { @@ -1768,7 +1768,7 @@ TAO::Objref_Traits<CORBA::StructDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::StructDef>::tao_release ( +TAO::Objref_Traits<CORBA::StructDef>::release ( CORBA::StructDef_ptr p ) { @@ -1777,14 +1777,14 @@ TAO::Objref_Traits<CORBA::StructDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StructDef_ptr -TAO::Objref_Traits<CORBA::StructDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::StructDef>::nil (void) { return CORBA::StructDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::StructDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::StructDef>::marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ) @@ -2020,7 +2020,7 @@ CORBA::StructDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::UnionDef_ptr -TAO::Objref_Traits<CORBA::UnionDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::UnionDef>::duplicate ( CORBA::UnionDef_ptr p ) { @@ -2029,7 +2029,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::UnionDef>::tao_release ( +TAO::Objref_Traits<CORBA::UnionDef>::release ( CORBA::UnionDef_ptr p ) { @@ -2038,14 +2038,14 @@ TAO::Objref_Traits<CORBA::UnionDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::UnionDef_ptr -TAO::Objref_Traits<CORBA::UnionDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::UnionDef>::nil (void) { return CORBA::UnionDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::UnionDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::UnionDef>::marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ) @@ -2408,7 +2408,7 @@ CORBA::UnionDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::EnumDef_ptr -TAO::Objref_Traits<CORBA::EnumDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::EnumDef>::duplicate ( CORBA::EnumDef_ptr p ) { @@ -2417,7 +2417,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::EnumDef>::tao_release ( +TAO::Objref_Traits<CORBA::EnumDef>::release ( CORBA::EnumDef_ptr p ) { @@ -2426,14 +2426,14 @@ TAO::Objref_Traits<CORBA::EnumDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::EnumDef_ptr -TAO::Objref_Traits<CORBA::EnumDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::EnumDef>::nil (void) { return CORBA::EnumDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::EnumDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::EnumDef>::marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ) @@ -2664,7 +2664,7 @@ CORBA::EnumDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AliasDef_ptr -TAO::Objref_Traits<CORBA::AliasDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::AliasDef>::duplicate ( CORBA::AliasDef_ptr p ) { @@ -2673,7 +2673,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AliasDef>::tao_release ( +TAO::Objref_Traits<CORBA::AliasDef>::release ( CORBA::AliasDef_ptr p ) { @@ -2682,14 +2682,14 @@ TAO::Objref_Traits<CORBA::AliasDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AliasDef_ptr -TAO::Objref_Traits<CORBA::AliasDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::AliasDef>::nil (void) { return CORBA::AliasDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AliasDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::AliasDef>::marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ) @@ -2920,7 +2920,7 @@ CORBA::AliasDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::NativeDef_ptr -TAO::Objref_Traits<CORBA::NativeDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::NativeDef>::duplicate ( CORBA::NativeDef_ptr p ) { @@ -2929,7 +2929,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::NativeDef>::tao_release ( +TAO::Objref_Traits<CORBA::NativeDef>::release ( CORBA::NativeDef_ptr p ) { @@ -2938,14 +2938,14 @@ TAO::Objref_Traits<CORBA::NativeDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::NativeDef_ptr -TAO::Objref_Traits<CORBA::NativeDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::NativeDef>::nil (void) { return CORBA::NativeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::NativeDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::NativeDef>::marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ) @@ -3091,7 +3091,7 @@ CORBA::NativeDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PrimitiveDef_ptr -TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::duplicate ( CORBA::PrimitiveDef_ptr p ) { @@ -3100,7 +3100,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_release ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::release ( CORBA::PrimitiveDef_ptr p ) { @@ -3109,14 +3109,14 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PrimitiveDef_ptr -TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::PrimitiveDef>::nil (void) { return CORBA::PrimitiveDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PrimitiveDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal ( CORBA::PrimitiveDef_ptr p, TAO_OutputCDR & cdr ) @@ -3296,7 +3296,7 @@ CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StringDef_ptr -TAO::Objref_Traits<CORBA::StringDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::StringDef>::duplicate ( CORBA::StringDef_ptr p ) { @@ -3305,7 +3305,7 @@ TAO::Objref_Traits<CORBA::StringDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::StringDef>::tao_release ( +TAO::Objref_Traits<CORBA::StringDef>::release ( CORBA::StringDef_ptr p ) { @@ -3314,14 +3314,14 @@ TAO::Objref_Traits<CORBA::StringDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::StringDef_ptr -TAO::Objref_Traits<CORBA::StringDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::StringDef>::nil (void) { return CORBA::StringDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::StringDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::StringDef>::marshal ( CORBA::StringDef_ptr p, TAO_OutputCDR & cdr ) @@ -3544,7 +3544,7 @@ CORBA::StringDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::WstringDef_ptr -TAO::Objref_Traits<CORBA::WstringDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::WstringDef>::duplicate ( CORBA::WstringDef_ptr p ) { @@ -3553,7 +3553,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::WstringDef>::tao_release ( +TAO::Objref_Traits<CORBA::WstringDef>::release ( CORBA::WstringDef_ptr p ) { @@ -3562,14 +3562,14 @@ TAO::Objref_Traits<CORBA::WstringDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::WstringDef_ptr -TAO::Objref_Traits<CORBA::WstringDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::WstringDef>::nil (void) { return CORBA::WstringDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::WstringDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::WstringDef>::marshal ( CORBA::WstringDef_ptr p, TAO_OutputCDR & cdr ) @@ -3792,7 +3792,7 @@ CORBA::WstringDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::SequenceDef_ptr -TAO::Objref_Traits<CORBA::SequenceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::SequenceDef>::duplicate ( CORBA::SequenceDef_ptr p ) { @@ -3801,7 +3801,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::SequenceDef>::tao_release ( +TAO::Objref_Traits<CORBA::SequenceDef>::release ( CORBA::SequenceDef_ptr p ) { @@ -3810,14 +3810,14 @@ TAO::Objref_Traits<CORBA::SequenceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::SequenceDef_ptr -TAO::Objref_Traits<CORBA::SequenceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::SequenceDef>::nil (void) { return CORBA::SequenceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::SequenceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::SequenceDef>::marshal ( CORBA::SequenceDef_ptr p, TAO_OutputCDR & cdr ) @@ -4167,7 +4167,7 @@ CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ArrayDef_ptr -TAO::Objref_Traits<CORBA::ArrayDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ArrayDef>::duplicate ( CORBA::ArrayDef_ptr p ) { @@ -4176,7 +4176,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ArrayDef>::tao_release ( +TAO::Objref_Traits<CORBA::ArrayDef>::release ( CORBA::ArrayDef_ptr p ) { @@ -4185,14 +4185,14 @@ TAO::Objref_Traits<CORBA::ArrayDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ArrayDef_ptr -TAO::Objref_Traits<CORBA::ArrayDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ArrayDef>::nil (void) { return CORBA::ArrayDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ArrayDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ArrayDef>::marshal ( CORBA::ArrayDef_ptr p, TAO_OutputCDR & cdr ) @@ -4542,7 +4542,7 @@ CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExceptionDef_ptr -TAO::Objref_Traits<CORBA::ExceptionDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExceptionDef>::duplicate ( CORBA::ExceptionDef_ptr p ) { @@ -4551,7 +4551,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExceptionDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExceptionDef>::release ( CORBA::ExceptionDef_ptr p ) { @@ -4560,14 +4560,14 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExceptionDef_ptr -TAO::Objref_Traits<CORBA::ExceptionDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExceptionDef>::nil (void) { return CORBA::ExceptionDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExceptionDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExceptionDef>::marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ) @@ -4893,7 +4893,7 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AttributeDef_ptr -TAO::Objref_Traits<CORBA::AttributeDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::AttributeDef>::duplicate ( CORBA::AttributeDef_ptr p ) { @@ -4902,7 +4902,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AttributeDef>::tao_release ( +TAO::Objref_Traits<CORBA::AttributeDef>::release ( CORBA::AttributeDef_ptr p ) { @@ -4911,14 +4911,14 @@ TAO::Objref_Traits<CORBA::AttributeDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AttributeDef_ptr -TAO::Objref_Traits<CORBA::AttributeDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::AttributeDef>::nil (void) { return CORBA::AttributeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AttributeDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::AttributeDef>::marshal ( CORBA::AttributeDef_ptr p, TAO_OutputCDR & cdr ) @@ -5294,7 +5294,7 @@ CORBA::ExtAttributeDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAttributeDef_ptr -TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::duplicate ( CORBA::ExtAttributeDef_ptr p ) { @@ -5303,7 +5303,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::release ( CORBA::ExtAttributeDef_ptr p ) { @@ -5312,14 +5312,14 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAttributeDef_ptr -TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExtAttributeDef>::nil (void) { return CORBA::ExtAttributeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtAttributeDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal ( CORBA::ExtAttributeDef_ptr p, TAO_OutputCDR & cdr ) @@ -5786,7 +5786,7 @@ void CORBA::ContextIdSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::OperationDef_ptr -TAO::Objref_Traits<CORBA::OperationDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::OperationDef>::duplicate ( CORBA::OperationDef_ptr p ) { @@ -5795,7 +5795,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::OperationDef>::tao_release ( +TAO::Objref_Traits<CORBA::OperationDef>::release ( CORBA::OperationDef_ptr p ) { @@ -5804,14 +5804,14 @@ TAO::Objref_Traits<CORBA::OperationDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::OperationDef_ptr -TAO::Objref_Traits<CORBA::OperationDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::OperationDef>::nil (void) { return CORBA::OperationDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::OperationDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::OperationDef>::marshal ( CORBA::OperationDef_ptr p, TAO_OutputCDR & cdr ) @@ -6635,7 +6635,7 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceDef_ptr -TAO::Objref_Traits<CORBA::InterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::InterfaceDef>::duplicate ( CORBA::InterfaceDef_ptr p ) { @@ -6644,7 +6644,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::InterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::InterfaceDef>::release ( CORBA::InterfaceDef_ptr p ) { @@ -6653,14 +6653,14 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceDef_ptr -TAO::Objref_Traits<CORBA::InterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::InterfaceDef>::nil (void) { return CORBA::InterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::InterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7129,7 +7129,7 @@ CORBA::InterfaceDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceAttrExtension_ptr -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_duplicate ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::duplicate ( CORBA::InterfaceAttrExtension_ptr p ) { @@ -7138,7 +7138,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_release ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release ( CORBA::InterfaceAttrExtension_ptr p ) { @@ -7147,14 +7147,14 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::InterfaceAttrExtension_ptr -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_nil (void) +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::nil (void) { return CORBA::InterfaceAttrExtension::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::tao_marshal ( +TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal ( CORBA::InterfaceAttrExtension_ptr p, TAO_OutputCDR & cdr ) @@ -7400,7 +7400,7 @@ CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::duplicate ( CORBA::ExtInterfaceDef_ptr p ) { @@ -7409,7 +7409,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release ( CORBA::ExtInterfaceDef_ptr p ) { @@ -7418,14 +7418,14 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::nil (void) { return CORBA::ExtInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtInterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7580,7 +7580,7 @@ CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::duplicate ( CORBA::AbstractInterfaceDef_ptr p ) { @@ -7589,7 +7589,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release ( CORBA::AbstractInterfaceDef_ptr p ) { @@ -7598,14 +7598,14 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::AbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::nil (void) { return CORBA::AbstractInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7755,7 +7755,7 @@ CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::duplicate ( CORBA::ExtAbstractInterfaceDef_ptr p ) { @@ -7764,7 +7764,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release ( CORBA::ExtAbstractInterfaceDef_ptr p ) { @@ -7773,14 +7773,14 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtAbstractInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::nil (void) { return CORBA::ExtAbstractInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -7939,7 +7939,7 @@ CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::LocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::duplicate ( CORBA::LocalInterfaceDef_ptr p ) { @@ -7948,7 +7948,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release ( CORBA::LocalInterfaceDef_ptr p ) { @@ -7957,14 +7957,14 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::LocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::nil (void) { return CORBA::LocalInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::LocalInterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ) @@ -8114,7 +8114,7 @@ CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtLocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::duplicate ( CORBA::ExtLocalInterfaceDef_ptr p ) { @@ -8123,7 +8123,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release ( CORBA::ExtLocalInterfaceDef_ptr p ) { @@ -8132,14 +8132,14 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtLocalInterfaceDef_ptr -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::nil (void) { return CORBA::ExtLocalInterfaceDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index b1bf2abe16e..31319ba79cc 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -4459,14 +4459,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::Repository> { - static CORBA::Repository_ptr tao_duplicate ( + static CORBA::Repository_ptr duplicate ( CORBA::Repository_ptr ); - static void tao_release ( + static void release ( CORBA::Repository_ptr ); - static CORBA::Repository_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Repository_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -4480,14 +4480,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ModuleDef> { - static CORBA::ModuleDef_ptr tao_duplicate ( + static CORBA::ModuleDef_ptr duplicate ( CORBA::ModuleDef_ptr ); - static void tao_release ( + static void release ( CORBA::ModuleDef_ptr ); - static CORBA::ModuleDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ModuleDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -4501,14 +4501,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ConstantDef> { - static CORBA::ConstantDef_ptr tao_duplicate ( + static CORBA::ConstantDef_ptr duplicate ( CORBA::ConstantDef_ptr ); - static void tao_release ( + static void release ( CORBA::ConstantDef_ptr ); - static CORBA::ConstantDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ConstantDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ConstantDef_ptr p, TAO_OutputCDR & cdr ); @@ -4522,14 +4522,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StructDef> { - static CORBA::StructDef_ptr tao_duplicate ( + static CORBA::StructDef_ptr duplicate ( CORBA::StructDef_ptr ); - static void tao_release ( + static void release ( CORBA::StructDef_ptr ); - static CORBA::StructDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::StructDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::StructDef_ptr p, TAO_OutputCDR & cdr ); @@ -4543,14 +4543,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::UnionDef> { - static CORBA::UnionDef_ptr tao_duplicate ( + static CORBA::UnionDef_ptr duplicate ( CORBA::UnionDef_ptr ); - static void tao_release ( + static void release ( CORBA::UnionDef_ptr ); - static CORBA::UnionDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::UnionDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::UnionDef_ptr p, TAO_OutputCDR & cdr ); @@ -4564,14 +4564,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::EnumDef> { - static CORBA::EnumDef_ptr tao_duplicate ( + static CORBA::EnumDef_ptr duplicate ( CORBA::EnumDef_ptr ); - static void tao_release ( + static void release ( CORBA::EnumDef_ptr ); - static CORBA::EnumDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::EnumDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::EnumDef_ptr p, TAO_OutputCDR & cdr ); @@ -4585,14 +4585,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AliasDef> { - static CORBA::AliasDef_ptr tao_duplicate ( + static CORBA::AliasDef_ptr duplicate ( CORBA::AliasDef_ptr ); - static void tao_release ( + static void release ( CORBA::AliasDef_ptr ); - static CORBA::AliasDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::AliasDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::AliasDef_ptr p, TAO_OutputCDR & cdr ); @@ -4606,14 +4606,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceDef> { - static CORBA::InterfaceDef_ptr tao_duplicate ( + static CORBA::InterfaceDef_ptr duplicate ( CORBA::InterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::InterfaceDef_ptr ); - static CORBA::InterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::InterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::InterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4627,14 +4627,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExceptionDef> { - static CORBA::ExceptionDef_ptr tao_duplicate ( + static CORBA::ExceptionDef_ptr duplicate ( CORBA::ExceptionDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExceptionDef_ptr ); - static CORBA::ExceptionDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExceptionDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExceptionDef_ptr p, TAO_OutputCDR & cdr ); @@ -4648,14 +4648,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::NativeDef> { - static CORBA::NativeDef_ptr tao_duplicate ( + static CORBA::NativeDef_ptr duplicate ( CORBA::NativeDef_ptr ); - static void tao_release ( + static void release ( CORBA::NativeDef_ptr ); - static CORBA::NativeDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::NativeDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::NativeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4669,14 +4669,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AbstractInterfaceDef> { - static CORBA::AbstractInterfaceDef_ptr tao_duplicate ( + static CORBA::AbstractInterfaceDef_ptr duplicate ( CORBA::AbstractInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::AbstractInterfaceDef_ptr ); - static CORBA::AbstractInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::AbstractInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::AbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4690,14 +4690,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::LocalInterfaceDef> { - static CORBA::LocalInterfaceDef_ptr tao_duplicate ( + static CORBA::LocalInterfaceDef_ptr duplicate ( CORBA::LocalInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::LocalInterfaceDef_ptr ); - static CORBA::LocalInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::LocalInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::LocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4711,14 +4711,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtInterfaceDef> { - static CORBA::ExtInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtInterfaceDef_ptr duplicate ( CORBA::ExtInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtInterfaceDef_ptr ); - static CORBA::ExtInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4732,14 +4732,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAbstractInterfaceDef> { - static CORBA::ExtAbstractInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtAbstractInterfaceDef_ptr duplicate ( CORBA::ExtAbstractInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtAbstractInterfaceDef_ptr ); - static CORBA::ExtAbstractInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtAbstractInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtAbstractInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4753,14 +4753,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtLocalInterfaceDef> { - static CORBA::ExtLocalInterfaceDef_ptr tao_duplicate ( + static CORBA::ExtLocalInterfaceDef_ptr duplicate ( CORBA::ExtLocalInterfaceDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtLocalInterfaceDef_ptr ); - static CORBA::ExtLocalInterfaceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtLocalInterfaceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtLocalInterfaceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4774,14 +4774,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::PrimitiveDef> { - static CORBA::PrimitiveDef_ptr tao_duplicate ( + static CORBA::PrimitiveDef_ptr duplicate ( CORBA::PrimitiveDef_ptr ); - static void tao_release ( + static void release ( CORBA::PrimitiveDef_ptr ); - static CORBA::PrimitiveDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::PrimitiveDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::PrimitiveDef_ptr p, TAO_OutputCDR & cdr ); @@ -4795,14 +4795,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::StringDef> { - static CORBA::StringDef_ptr tao_duplicate ( + static CORBA::StringDef_ptr duplicate ( CORBA::StringDef_ptr ); - static void tao_release ( + static void release ( CORBA::StringDef_ptr ); - static CORBA::StringDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::StringDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::StringDef_ptr p, TAO_OutputCDR & cdr ); @@ -4816,14 +4816,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::SequenceDef> { - static CORBA::SequenceDef_ptr tao_duplicate ( + static CORBA::SequenceDef_ptr duplicate ( CORBA::SequenceDef_ptr ); - static void tao_release ( + static void release ( CORBA::SequenceDef_ptr ); - static CORBA::SequenceDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::SequenceDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::SequenceDef_ptr p, TAO_OutputCDR & cdr ); @@ -4837,14 +4837,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ArrayDef> { - static CORBA::ArrayDef_ptr tao_duplicate ( + static CORBA::ArrayDef_ptr duplicate ( CORBA::ArrayDef_ptr ); - static void tao_release ( + static void release ( CORBA::ArrayDef_ptr ); - static CORBA::ArrayDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ArrayDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ArrayDef_ptr p, TAO_OutputCDR & cdr ); @@ -4858,14 +4858,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::WstringDef> { - static CORBA::WstringDef_ptr tao_duplicate ( + static CORBA::WstringDef_ptr duplicate ( CORBA::WstringDef_ptr ); - static void tao_release ( + static void release ( CORBA::WstringDef_ptr ); - static CORBA::WstringDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::WstringDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::WstringDef_ptr p, TAO_OutputCDR & cdr ); @@ -4879,14 +4879,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef> { - static CORBA::FixedDef_ptr tao_duplicate ( + static CORBA::FixedDef_ptr duplicate ( CORBA::FixedDef_ptr ); - static void tao_release ( + static void release ( CORBA::FixedDef_ptr ); - static CORBA::FixedDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::FixedDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ); @@ -4900,14 +4900,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::AttributeDef> { - static CORBA::AttributeDef_ptr tao_duplicate ( + static CORBA::AttributeDef_ptr duplicate ( CORBA::AttributeDef_ptr ); - static void tao_release ( + static void release ( CORBA::AttributeDef_ptr ); - static CORBA::AttributeDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::AttributeDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::AttributeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4921,14 +4921,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtAttributeDef> { - static CORBA::ExtAttributeDef_ptr tao_duplicate ( + static CORBA::ExtAttributeDef_ptr duplicate ( CORBA::ExtAttributeDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtAttributeDef_ptr ); - static CORBA::ExtAttributeDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtAttributeDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtAttributeDef_ptr p, TAO_OutputCDR & cdr ); @@ -4942,14 +4942,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::OperationDef> { - static CORBA::OperationDef_ptr tao_duplicate ( + static CORBA::OperationDef_ptr duplicate ( CORBA::OperationDef_ptr ); - static void tao_release ( + static void release ( CORBA::OperationDef_ptr ); - static CORBA::OperationDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::OperationDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::OperationDef_ptr p, TAO_OutputCDR & cdr ); @@ -4963,14 +4963,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::InterfaceAttrExtension> { - static CORBA::InterfaceAttrExtension_ptr tao_duplicate ( + static CORBA::InterfaceAttrExtension_ptr duplicate ( CORBA::InterfaceAttrExtension_ptr ); - static void tao_release ( + static void release ( CORBA::InterfaceAttrExtension_ptr ); - static CORBA::InterfaceAttrExtension_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::InterfaceAttrExtension_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::InterfaceAttrExtension_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index fc1c6142e55..a41531e4f0e 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -599,7 +599,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::duplicate ( CORBA::ComponentIR::EventDef_ptr p ) { @@ -608,7 +608,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release ( CORBA::ComponentIR::EventDef_ptr p ) { @@ -617,14 +617,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::nil (void) { return CORBA::ComponentIR::EventDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal ( CORBA::ComponentIR::EventDef_ptr p, TAO_OutputCDR & cdr ) @@ -778,7 +778,7 @@ CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Container_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::duplicate ( CORBA::ComponentIR::Container_ptr p ) { @@ -787,7 +787,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::release ( CORBA::ComponentIR::Container_ptr p ) { @@ -796,14 +796,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Container_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::Container>::nil (void) { return CORBA::ComponentIR::Container::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::Container>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal ( CORBA::ComponentIR::Container_ptr p, TAO_OutputCDR & cdr ) @@ -1133,7 +1133,7 @@ CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::duplicate ( CORBA::ComponentIR::ModuleDef_ptr p ) { @@ -1142,7 +1142,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release ( CORBA::ComponentIR::ModuleDef_ptr p ) { @@ -1151,14 +1151,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ModuleDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::nil (void) { return CORBA::ComponentIR::ModuleDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal ( CORBA::ComponentIR::ModuleDef_ptr p, TAO_OutputCDR & cdr ) @@ -1309,7 +1309,7 @@ CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Repository_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::duplicate ( CORBA::ComponentIR::Repository_ptr p ) { @@ -1318,7 +1318,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release ( CORBA::ComponentIR::Repository_ptr p ) { @@ -1327,14 +1327,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::Repository_ptr -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::nil (void) { return CORBA::ComponentIR::Repository::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::Repository>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal ( CORBA::ComponentIR::Repository_ptr p, TAO_OutputCDR & cdr ) @@ -1481,7 +1481,7 @@ CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ProvidesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::duplicate ( CORBA::ComponentIR::ProvidesDef_ptr p ) { @@ -1490,7 +1490,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release ( CORBA::ComponentIR::ProvidesDef_ptr p ) { @@ -1499,14 +1499,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ProvidesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::nil (void) { return CORBA::ComponentIR::ProvidesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal ( CORBA::ComponentIR::ProvidesDef_ptr p, TAO_OutputCDR & cdr ) @@ -1742,7 +1742,7 @@ CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::UsesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::duplicate ( CORBA::ComponentIR::UsesDef_ptr p ) { @@ -1751,7 +1751,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release ( CORBA::ComponentIR::UsesDef_ptr p ) { @@ -1760,14 +1760,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::UsesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::nil (void) { return CORBA::ComponentIR::UsesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal ( CORBA::ComponentIR::UsesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2088,7 +2088,7 @@ CORBA::ComponentIR::UsesDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventPortDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::duplicate ( CORBA::ComponentIR::EventPortDef_ptr p ) { @@ -2097,7 +2097,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release ( CORBA::ComponentIR::EventPortDef_ptr p ) { @@ -2106,14 +2106,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EventPortDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::nil (void) { return CORBA::ComponentIR::EventPortDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal ( CORBA::ComponentIR::EventPortDef_ptr p, TAO_OutputCDR & cdr ) @@ -2394,7 +2394,7 @@ CORBA::ComponentIR::EventPortDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EmitsDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::duplicate ( CORBA::ComponentIR::EmitsDef_ptr p ) { @@ -2403,7 +2403,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release ( CORBA::ComponentIR::EmitsDef_ptr p ) { @@ -2412,14 +2412,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::EmitsDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::nil (void) { return CORBA::ComponentIR::EmitsDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal ( CORBA::ComponentIR::EmitsDef_ptr p, TAO_OutputCDR & cdr ) @@ -2561,7 +2561,7 @@ CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::PublishesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::duplicate ( CORBA::ComponentIR::PublishesDef_ptr p ) { @@ -2570,7 +2570,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release ( CORBA::ComponentIR::PublishesDef_ptr p ) { @@ -2579,14 +2579,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::PublishesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::nil (void) { return CORBA::ComponentIR::PublishesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal ( CORBA::ComponentIR::PublishesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2728,7 +2728,7 @@ CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ConsumesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::duplicate ( CORBA::ComponentIR::ConsumesDef_ptr p ) { @@ -2737,7 +2737,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release ( CORBA::ComponentIR::ConsumesDef_ptr p ) { @@ -2746,14 +2746,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ConsumesDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::nil (void) { return CORBA::ComponentIR::ConsumesDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal ( CORBA::ComponentIR::ConsumesDef_ptr p, TAO_OutputCDR & cdr ) @@ -2895,7 +2895,7 @@ CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ComponentDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::duplicate ( CORBA::ComponentIR::ComponentDef_ptr p ) { @@ -2904,7 +2904,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release ( CORBA::ComponentIR::ComponentDef_ptr p ) { @@ -2913,14 +2913,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::ComponentDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::nil (void) { return CORBA::ComponentIR::ComponentDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal ( CORBA::ComponentIR::ComponentDef_ptr p, TAO_OutputCDR & cdr ) @@ -3693,7 +3693,7 @@ CORBA::ComponentIR::ComponentDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FactoryDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::duplicate ( CORBA::ComponentIR::FactoryDef_ptr p ) { @@ -3702,7 +3702,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release ( CORBA::ComponentIR::FactoryDef_ptr p ) { @@ -3711,14 +3711,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FactoryDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::nil (void) { return CORBA::ComponentIR::FactoryDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal ( CORBA::ComponentIR::FactoryDef_ptr p, TAO_OutputCDR & cdr ) @@ -3860,7 +3860,7 @@ CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FinderDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::duplicate ( CORBA::ComponentIR::FinderDef_ptr p ) { @@ -3869,7 +3869,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release ( CORBA::ComponentIR::FinderDef_ptr p ) { @@ -3878,14 +3878,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::FinderDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::nil (void) { return CORBA::ComponentIR::FinderDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal ( CORBA::ComponentIR::FinderDef_ptr p, TAO_OutputCDR & cdr ) @@ -4027,7 +4027,7 @@ CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::HomeDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::duplicate ( CORBA::ComponentIR::HomeDef_ptr p ) { @@ -4036,7 +4036,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_release ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release ( CORBA::ComponentIR::HomeDef_ptr p ) { @@ -4045,14 +4045,14 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ComponentIR::HomeDef_ptr -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::nil (void) { return CORBA::ComponentIR::HomeDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal ( CORBA::ComponentIR::HomeDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index 1acd22d6ed5..a4f9abf3170 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -2462,14 +2462,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ComponentDef> { - static CORBA::ComponentIR::ComponentDef_ptr tao_duplicate ( + static CORBA::ComponentIR::ComponentDef_ptr duplicate ( CORBA::ComponentIR::ComponentDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::ComponentDef_ptr ); - static CORBA::ComponentIR::ComponentDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::ComponentDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::ComponentDef_ptr p, TAO_OutputCDR & cdr ); @@ -2483,14 +2483,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::HomeDef> { - static CORBA::ComponentIR::HomeDef_ptr tao_duplicate ( + static CORBA::ComponentIR::HomeDef_ptr duplicate ( CORBA::ComponentIR::HomeDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::HomeDef_ptr ); - static CORBA::ComponentIR::HomeDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::HomeDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::HomeDef_ptr p, TAO_OutputCDR & cdr ); @@ -2504,14 +2504,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventDef> { - static CORBA::ComponentIR::EventDef_ptr tao_duplicate ( + static CORBA::ComponentIR::EventDef_ptr duplicate ( CORBA::ComponentIR::EventDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::EventDef_ptr ); - static CORBA::ComponentIR::EventDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::EventDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::EventDef_ptr p, TAO_OutputCDR & cdr ); @@ -2525,14 +2525,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Container> { - static CORBA::ComponentIR::Container_ptr tao_duplicate ( + static CORBA::ComponentIR::Container_ptr duplicate ( CORBA::ComponentIR::Container_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::Container_ptr ); - static CORBA::ComponentIR::Container_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::Container_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::Container_ptr p, TAO_OutputCDR & cdr ); @@ -2546,14 +2546,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ModuleDef> { - static CORBA::ComponentIR::ModuleDef_ptr tao_duplicate ( + static CORBA::ComponentIR::ModuleDef_ptr duplicate ( CORBA::ComponentIR::ModuleDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::ModuleDef_ptr ); - static CORBA::ComponentIR::ModuleDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::ModuleDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::ModuleDef_ptr p, TAO_OutputCDR & cdr ); @@ -2567,14 +2567,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::Repository> { - static CORBA::ComponentIR::Repository_ptr tao_duplicate ( + static CORBA::ComponentIR::Repository_ptr duplicate ( CORBA::ComponentIR::Repository_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::Repository_ptr ); - static CORBA::ComponentIR::Repository_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::Repository_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::Repository_ptr p, TAO_OutputCDR & cdr ); @@ -2588,14 +2588,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ProvidesDef> { - static CORBA::ComponentIR::ProvidesDef_ptr tao_duplicate ( + static CORBA::ComponentIR::ProvidesDef_ptr duplicate ( CORBA::ComponentIR::ProvidesDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::ProvidesDef_ptr ); - static CORBA::ComponentIR::ProvidesDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::ProvidesDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::ProvidesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2609,14 +2609,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::UsesDef> { - static CORBA::ComponentIR::UsesDef_ptr tao_duplicate ( + static CORBA::ComponentIR::UsesDef_ptr duplicate ( CORBA::ComponentIR::UsesDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::UsesDef_ptr ); - static CORBA::ComponentIR::UsesDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::UsesDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::UsesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2630,14 +2630,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EventPortDef> { - static CORBA::ComponentIR::EventPortDef_ptr tao_duplicate ( + static CORBA::ComponentIR::EventPortDef_ptr duplicate ( CORBA::ComponentIR::EventPortDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::EventPortDef_ptr ); - static CORBA::ComponentIR::EventPortDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::EventPortDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::EventPortDef_ptr p, TAO_OutputCDR & cdr ); @@ -2651,14 +2651,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::EmitsDef> { - static CORBA::ComponentIR::EmitsDef_ptr tao_duplicate ( + static CORBA::ComponentIR::EmitsDef_ptr duplicate ( CORBA::ComponentIR::EmitsDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::EmitsDef_ptr ); - static CORBA::ComponentIR::EmitsDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::EmitsDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::EmitsDef_ptr p, TAO_OutputCDR & cdr ); @@ -2672,14 +2672,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::PublishesDef> { - static CORBA::ComponentIR::PublishesDef_ptr tao_duplicate ( + static CORBA::ComponentIR::PublishesDef_ptr duplicate ( CORBA::ComponentIR::PublishesDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::PublishesDef_ptr ); - static CORBA::ComponentIR::PublishesDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::PublishesDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::PublishesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2693,14 +2693,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::ConsumesDef> { - static CORBA::ComponentIR::ConsumesDef_ptr tao_duplicate ( + static CORBA::ComponentIR::ConsumesDef_ptr duplicate ( CORBA::ComponentIR::ConsumesDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::ConsumesDef_ptr ); - static CORBA::ComponentIR::ConsumesDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::ConsumesDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::ConsumesDef_ptr p, TAO_OutputCDR & cdr ); @@ -2714,14 +2714,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FactoryDef> { - static CORBA::ComponentIR::FactoryDef_ptr tao_duplicate ( + static CORBA::ComponentIR::FactoryDef_ptr duplicate ( CORBA::ComponentIR::FactoryDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::FactoryDef_ptr ); - static CORBA::ComponentIR::FactoryDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::FactoryDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::FactoryDef_ptr p, TAO_OutputCDR & cdr ); @@ -2735,14 +2735,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ComponentIR::FinderDef> { - static CORBA::ComponentIR::FinderDef_ptr tao_duplicate ( + static CORBA::ComponentIR::FinderDef_ptr duplicate ( CORBA::ComponentIR::FinderDef_ptr ); - static void tao_release ( + static void release ( CORBA::ComponentIR::FinderDef_ptr ); - static CORBA::ComponentIR::FinderDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ComponentIR::FinderDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ComponentIR::FinderDef_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 838d54cf154..444a2cfab77 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -518,7 +518,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::FixedDef_ptr -TAO::Objref_Traits<CORBA::FixedDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::FixedDef>::duplicate ( CORBA::FixedDef_ptr p ) { @@ -527,7 +527,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::FixedDef>::tao_release ( +TAO::Objref_Traits<CORBA::FixedDef>::release ( CORBA::FixedDef_ptr p ) { @@ -536,14 +536,14 @@ TAO::Objref_Traits<CORBA::FixedDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::FixedDef_ptr -TAO::Objref_Traits<CORBA::FixedDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::FixedDef>::nil (void) { return CORBA::FixedDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::FixedDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::FixedDef>::marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ) @@ -917,7 +917,7 @@ void CORBA::ValueMemberSeq::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueMemberDef_ptr -TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::duplicate ( CORBA::ValueMemberDef_ptr p ) { @@ -926,7 +926,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_release ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::release ( CORBA::ValueMemberDef_ptr p ) { @@ -935,14 +935,14 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueMemberDef_ptr -TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ValueMemberDef>::nil (void) { return CORBA::ValueMemberDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueMemberDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal ( CORBA::ValueMemberDef_ptr p, TAO_OutputCDR & cdr ) @@ -1292,7 +1292,7 @@ CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueDef_ptr -TAO::Objref_Traits<CORBA::ValueDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ValueDef>::duplicate ( CORBA::ValueDef_ptr p ) { @@ -1301,7 +1301,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueDef>::tao_release ( +TAO::Objref_Traits<CORBA::ValueDef>::release ( CORBA::ValueDef_ptr p ) { @@ -1310,14 +1310,14 @@ TAO::Objref_Traits<CORBA::ValueDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueDef_ptr -TAO::Objref_Traits<CORBA::ValueDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ValueDef>::nil (void) { return CORBA::ValueDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ValueDef>::marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ) @@ -2353,7 +2353,7 @@ CORBA::ValueDescription::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtValueDef_ptr -TAO::Objref_Traits<CORBA::ExtValueDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ExtValueDef>::duplicate ( CORBA::ExtValueDef_ptr p ) { @@ -2362,7 +2362,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ExtValueDef>::tao_release ( +TAO::Objref_Traits<CORBA::ExtValueDef>::release ( CORBA::ExtValueDef_ptr p ) { @@ -2371,14 +2371,14 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ExtValueDef_ptr -TAO::Objref_Traits<CORBA::ExtValueDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ExtValueDef>::nil (void) { return CORBA::ExtValueDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ExtValueDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ) @@ -2731,7 +2731,7 @@ CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueBoxDef_ptr -TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_duplicate ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::duplicate ( CORBA::ValueBoxDef_ptr p ) { @@ -2740,7 +2740,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_release ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::release ( CORBA::ValueBoxDef_ptr p ) { @@ -2749,14 +2749,14 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::ValueBoxDef_ptr -TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_nil (void) +TAO::Objref_Traits<CORBA::ValueBoxDef>::nil (void) { return CORBA::ValueBoxDef::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::ValueBoxDef>::tao_marshal ( +TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 2b62a2bede4..61c72d2bbc8 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -1297,14 +1297,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueDef> { - static CORBA::ValueDef_ptr tao_duplicate ( + static CORBA::ValueDef_ptr duplicate ( CORBA::ValueDef_ptr ); - static void tao_release ( + static void release ( CORBA::ValueDef_ptr ); - static CORBA::ValueDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ValueDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -1318,14 +1318,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueBoxDef> { - static CORBA::ValueBoxDef_ptr tao_duplicate ( + static CORBA::ValueBoxDef_ptr duplicate ( CORBA::ValueBoxDef_ptr ); - static void tao_release ( + static void release ( CORBA::ValueBoxDef_ptr ); - static CORBA::ValueBoxDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ValueBoxDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ValueBoxDef_ptr p, TAO_OutputCDR & cdr ); @@ -1339,14 +1339,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ExtValueDef> { - static CORBA::ExtValueDef_ptr tao_duplicate ( + static CORBA::ExtValueDef_ptr duplicate ( CORBA::ExtValueDef_ptr ); - static void tao_release ( + static void release ( CORBA::ExtValueDef_ptr ); - static CORBA::ExtValueDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ExtValueDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ExtValueDef_ptr p, TAO_OutputCDR & cdr ); @@ -1360,14 +1360,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::FixedDef> { - static CORBA::FixedDef_ptr tao_duplicate ( + static CORBA::FixedDef_ptr duplicate ( CORBA::FixedDef_ptr ); - static void tao_release ( + static void release ( CORBA::FixedDef_ptr ); - static CORBA::FixedDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::FixedDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::FixedDef_ptr p, TAO_OutputCDR & cdr ); @@ -1381,14 +1381,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_IFR_Client_Export Objref_Traits<CORBA::ValueMemberDef> { - static CORBA::ValueMemberDef_ptr tao_duplicate ( + static CORBA::ValueMemberDef_ptr duplicate ( CORBA::ValueMemberDef_ptr ); - static void tao_release ( + static void release ( CORBA::ValueMemberDef_ptr ); - static CORBA::ValueMemberDef_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::ValueMemberDef_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::ValueMemberDef_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index e12e125fcb1..8deb1c31355 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -9,6 +9,7 @@ #include "Profile_Transport_Resolver.h" #include "Transport.h" #include "Wait_Strategy.h" +#include "SystemException.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" @@ -330,7 +331,7 @@ TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO_IIOP_Profile (this->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index a19999c8d7f..724fcd451fc 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -4,6 +4,7 @@ #include "tao/debug.h" #include "tao/IIOP_EndpointsC.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" @@ -123,7 +124,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // No object key delimiter or no hostname specified. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -138,7 +139,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // No hostname specified! It is required by the spec. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -164,7 +165,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -210,7 +211,7 @@ TAO_IIOP_Profile::parse_string_i (const char *ior // @@ What's the right exception to throw here? ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 5a99e777ab4..3a6a8dbddaa 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -30,6 +30,7 @@ #include "IOP_CodecC.h" +#include "tao/SystemException.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -57,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr -TAO::Objref_Traits<IOP::Codec>::tao_duplicate ( +TAO::Objref_Traits<IOP::Codec>::duplicate ( IOP::Codec_ptr p ) { @@ -66,7 +67,7 @@ TAO::Objref_Traits<IOP::Codec>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IOP::Codec>::tao_release ( +TAO::Objref_Traits<IOP::Codec>::release ( IOP::Codec_ptr p ) { @@ -75,14 +76,14 @@ TAO::Objref_Traits<IOP::Codec>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::Codec_ptr -TAO::Objref_Traits<IOP::Codec>::tao_nil (void) +TAO::Objref_Traits<IOP::Codec>::nil (void) { return IOP::Codec::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IOP::Codec>::tao_marshal ( +TAO::Objref_Traits<IOP::Codec>::marshal ( IOP::Codec_ptr p, TAO_OutputCDR & cdr ) @@ -661,7 +662,7 @@ IOP::Encoding::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr -TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate ( +TAO::Objref_Traits<IOP::CodecFactory>::duplicate ( IOP::CodecFactory_ptr p ) { @@ -670,7 +671,7 @@ TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IOP::CodecFactory>::tao_release ( +TAO::Objref_Traits<IOP::CodecFactory>::release ( IOP::CodecFactory_ptr p ) { @@ -679,14 +680,14 @@ TAO::Objref_Traits<IOP::CodecFactory>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IOP::CodecFactory_ptr -TAO::Objref_Traits<IOP::CodecFactory>::tao_nil (void) +TAO::Objref_Traits<IOP::CodecFactory>::nil (void) { return IOP::CodecFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal ( +TAO::Objref_Traits<IOP::CodecFactory>::marshal ( IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index 3c05765c8d8..7e54eff7435 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -70,13 +70,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -86,22 +86,22 @@ namespace TAO namespace IOP { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IOP_CODEC__VAR_OUT_CH_) #define _IOP_CODEC__VAR_OUT_CH_ - + class Codec; typedef Codec *Codec_ptr; - + typedef TAO_Objref_Var_T< Codec > Codec_var; - + typedef TAO_Objref_Out_T< Codec @@ -109,58 +109,58 @@ namespace IOP Codec_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODEC_CH_) #define _IOP_CODEC_CH_ - + class TAO_Export Codec : public virtual CORBA::Object { public: typedef Codec_ptr _ptr_type; typedef Codec_var _var_type; - + // The static operations. static Codec_ptr _duplicate (Codec_ptr obj); - + static Codec_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Codec_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Codec_ptr _nil (void) { return (Codec_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_) #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_ - + class TAO_Export InvalidTypeForEncoding : public CORBA::UserException { public: - + InvalidTypeForEncoding (void); InvalidTypeForEncoding (const InvalidTypeForEncoding &); ~InvalidTypeForEncoding (void); InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &); - + static void _tao_any_destructor (void *); - + static InvalidTypeForEncoding *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -172,43 +172,43 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_) #define _IOP_CODEC_FORMATMISMATCH_CH_ - + class TAO_Export FormatMismatch : public CORBA::UserException { public: - + FormatMismatch (void); FormatMismatch (const FormatMismatch &); ~FormatMismatch (void); FormatMismatch &operator= (const FormatMismatch &); - + static void _tao_any_destructor (void *); - + static FormatMismatch *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -220,43 +220,43 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_FormatMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_) #define _IOP_CODEC_TYPEMISMATCH_CH_ - + class TAO_Export TypeMismatch : public CORBA::UserException { public: - + TypeMismatch (void); TypeMismatch (const TypeMismatch &); ~TypeMismatch (void); TypeMismatch &operator= (const TypeMismatch &); - + static void _tao_any_destructor (void *); - + static TypeMismatch *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -268,28 +268,28 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_TypeMismatch; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode ( const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -298,10 +298,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * decode ( const CORBA::OctetSeq & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -310,10 +310,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::FormatMismatch )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OctetSeq * encode_value ( const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -322,10 +322,10 @@ namespace IOP CORBA::SystemException , IOP::Codec::InvalidTypeForEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * decode_value ( const CORBA::OctetSeq & data, CORBA::TypeCode_ptr tc @@ -336,102 +336,102 @@ namespace IOP , IOP::Codec::FormatMismatch , IOP::Codec::TypeMismatch )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Codec (void); - + virtual ~Codec (void); - + private: // Private and unimplemented for concrete interfaces. Codec (const Codec &); - + void operator= (const Codec &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct Encoding; - + typedef TAO_Fixed_Var_T< Encoding > Encoding_var; - + typedef Encoding & Encoding_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export Encoding { typedef Encoding_var _var_type; - + static void _tao_any_destructor (void *); IOP::EncodingFormat format; CORBA::Octet major_version; CORBA::Octet minor_version; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_) #define _IOP_CODECFACTORY__VAR_OUT_CH_ - + class CodecFactory; typedef CodecFactory *CodecFactory_ptr; - + typedef TAO_Objref_Var_T< CodecFactory > CodecFactory_var; - + typedef TAO_Objref_Out_T< CodecFactory @@ -439,58 +439,58 @@ namespace IOP CodecFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ - + class TAO_Export CodecFactory : public virtual CORBA::Object { public: typedef CodecFactory_ptr _ptr_type; typedef CodecFactory_var _var_type; - + // The static operations. static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); - + static CodecFactory_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static CodecFactory_ptr _nil (void) { return (CodecFactory_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_) #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_ - + class TAO_Export UnknownEncoding : public CORBA::UserException { public: - + UnknownEncoding (void); UnknownEncoding (const UnknownEncoding &); ~UnknownEncoding (void); UnknownEncoding &operator= (const UnknownEncoding &); - + static void _tao_any_destructor (void *); - + static UnknownEncoding *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -502,28 +502,28 @@ namespace IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr _tc_UnknownEncoding; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::IOP::Codec_ptr create_codec ( const IOP::Encoding & enc ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -532,36 +532,36 @@ namespace IOP CORBA::SystemException , IOP::CodecFactory::UnknownEncoding )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. CodecFactory (void); - + virtual ~CodecFactory (void); - + private: // Private and unimplemented for concrete interfaces. CodecFactory (const CodecFactory &); - + void operator= (const CodecFactory &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory; // TAO_IDL - Generated from @@ -578,18 +578,18 @@ namespace TAO #if !defined (_IOP_CODEC__TRAITS_CH_) #define _IOP_CODEC__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<IOP::Codec> { - static IOP::Codec_ptr tao_duplicate ( + static IOP::Codec_ptr duplicate ( IOP::Codec_ptr ); - static void tao_release ( + static void release ( IOP::Codec_ptr ); - static IOP::Codec_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static IOP::Codec_ptr nil (void); + static CORBA::Boolean marshal ( IOP::Codec_ptr p, TAO_OutputCDR & cdr ); @@ -599,18 +599,18 @@ namespace TAO #if !defined (_IOP_CODECFACTORY__TRAITS_CH_) #define _IOP_CODECFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<IOP::CodecFactory> { - static IOP::CodecFactory_ptr tao_duplicate ( + static IOP::CodecFactory_ptr duplicate ( IOP::CodecFactory_ptr ); - static void tao_release ( + static void release ( IOP::CodecFactory_ptr ); - static IOP::CodecFactory_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static IOP::CodecFactory_ptr nil (void); + static CORBA::Boolean marshal ( IOP::CodecFactory_ptr p, TAO_OutputCDR & cdr ); @@ -697,4 +697,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp index 07779a7625f..896032224e6 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.cpp +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -51,7 +51,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory> : public @@ -75,7 +75,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInfo_ptr -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::IORInfo>::duplicate ( PortableInterceptor::IORInfo_ptr p ) { @@ -84,7 +84,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::IORInfo>::release ( PortableInterceptor::IORInfo_ptr p ) { @@ -93,14 +93,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInfo_ptr -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::IORInfo>::nil (void) { return PortableInterceptor::IORInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::IORInfo>::marshal ( PortableInterceptor::IORInfo_ptr p, TAO_OutputCDR & cdr ) @@ -109,7 +109,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInfo>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*PortableInterceptor__TAO_IORInfo_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -130,10 +130,10 @@ PortableInterceptor::IORInfo::_narrow ( { return IORInfo::_nil (); } - + IORInfo_ptr proxy = dynamic_cast<IORInfo_ptr> (_tao_objref); - + return IORInfo::_duplicate (proxy); } @@ -147,10 +147,10 @@ PortableInterceptor::IORInfo::_unchecked_narrow ( { return IORInfo::_nil (); } - + IORInfo_ptr proxy = dynamic_cast<IORInfo_ptr> (_tao_objref); - + return IORInfo::_duplicate (proxy); } @@ -161,7 +161,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -223,7 +223,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) PortableInterceptor::ObjectReferenceFactory *, PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::ObjectReferenceFactory_out, - TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> + TAO::Objref_Traits<PortableInterceptor::ObjectReferenceFactory> >; #endif /* end #if !defined */ @@ -237,7 +237,7 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< PortableInterceptor::IORInfo >; - + template class TAO_Objref_Out_T< PortableInterceptor::IORInfo @@ -272,11 +272,10 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ PortableInterceptor::IORInfo > - + # pragma instantiate \ TAO_Objref_Out_T< \ PortableInterceptor::IORInfo > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h index f749cd107d8..160cc0dd71e 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.h +++ b/TAO/tao/IORInterceptor/IORInfoC.h @@ -72,13 +72,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -88,22 +88,22 @@ namespace TAO namespace PortableInterceptor { - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ - + class IORInfo; typedef IORInfo *IORInfo_ptr; - + typedef TAO_Objref_Var_T< IORInfo > IORInfo_var; - + typedef TAO_Objref_Out_T< IORInfo @@ -111,43 +111,43 @@ namespace PortableInterceptor IORInfo_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) #define _PORTABLEINTERCEPTOR_IORINFO_CH_ - + class TAO_IORInterceptor_Export IORInfo : public virtual CORBA::Object { public: typedef IORInfo_ptr _ptr_type; typedef IORInfo_var _var_type; - + // The static operations. static IORInfo_ptr _duplicate (IORInfo_ptr obj); - + static IORInfo_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInfo_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInfo_ptr _nil (void) { return (IORInfo_ptr)0; } - - - + + + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr get_effective_policy ( ::CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -155,10 +155,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_ior_component ( const ::IOP::TaggedComponent & a_component ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -166,10 +166,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void add_ior_component_to_profile ( const ::IOP::TaggedComponent & a_component, ::IOP::ProfileId profile_id @@ -178,50 +178,50 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual PortableInterceptor::AdapterManagerId manager_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual PortableInterceptor::AdapterState state ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void current_factory ( ::PortableInterceptor::ObjectReferenceFactory * current_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -229,28 +229,28 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. IORInfo (void); - + virtual ~IORInfo (void); - + private: // Private and unimplemented for concrete interfaces. IORInfo (const IORInfo &); - + void operator= (const IORInfo &); }; @@ -270,18 +270,18 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo> { - static ::PortableInterceptor::IORInfo_ptr tao_duplicate ( + static ::PortableInterceptor::IORInfo_ptr duplicate ( ::PortableInterceptor::IORInfo_ptr ); - static void tao_release ( + static void release ( ::PortableInterceptor::IORInfo_ptr ); - static ::PortableInterceptor::IORInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ::PortableInterceptor::IORInfo_ptr nil (void); + static CORBA::Boolean marshal ( ::PortableInterceptor::IORInfo_ptr p, TAO_OutputCDR & cdr ); @@ -308,4 +308,3 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index 6e0d078e22a..be51db89f4b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -57,7 +57,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::duplicate ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -66,7 +66,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::release ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -75,14 +75,14 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::IORInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::nil (void) { return PortableInterceptor::IORInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::marshal ( PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -91,7 +91,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -112,10 +112,10 @@ PortableInterceptor::IORInterceptor::_narrow ( { return IORInterceptor::_nil (); } - + IORInterceptor_ptr proxy = dynamic_cast<IORInterceptor_ptr> (_tao_objref); - + return IORInterceptor::_duplicate (proxy); } @@ -129,10 +129,10 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow ( { return IORInterceptor::_nil (); } - + IORInterceptor_ptr proxy = dynamic_cast<IORInterceptor_ptr> (_tao_objref); - + return IORInterceptor::_duplicate (proxy); } @@ -143,7 +143,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -205,7 +205,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< PortableInterceptor::IORInterceptor >; - + template class TAO_Objref_Out_T< PortableInterceptor::IORInterceptor @@ -222,11 +222,10 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ PortableInterceptor::IORInterceptor > - + # pragma instantiate \ TAO_Objref_Out_T< \ PortableInterceptor::IORInterceptor > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index 1f2dd3fb3ba..e7e07e8f806 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -73,13 +73,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -89,22 +89,22 @@ namespace TAO namespace PortableInterceptor { - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:613 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ - + class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - + typedef TAO_Objref_Var_T< IORInterceptor > IORInterceptor_var; - + typedef TAO_Objref_Out_T< IORInterceptor @@ -112,43 +112,43 @@ namespace PortableInterceptor IORInterceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_ - + class TAO_IORInterceptor_Export IORInterceptor : public virtual ::PortableInterceptor::Interceptor { public: typedef IORInterceptor_ptr _ptr_type; typedef IORInterceptor_var _var_type; - + // The static operations. static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj); - + static IORInterceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static IORInterceptor_ptr _nil (void) { return (IORInterceptor_ptr)0; } - - - + + + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void establish_components ( ::PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -156,10 +156,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void components_established ( ::PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -167,10 +167,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void adapter_manager_state_changed ( ::PortableInterceptor::AdapterManagerId id, ::PortableInterceptor::AdapterState state @@ -179,10 +179,10 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void adapter_state_changed ( const ::PortableInterceptor::ObjectReferenceTemplateSeq & templates, ::PortableInterceptor::AdapterState state @@ -191,28 +191,28 @@ namespace PortableInterceptor ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. IORInterceptor (void); - + virtual ~IORInterceptor (void); - + private: // Private and unimplemented for concrete interfaces. IORInterceptor (const IORInterceptor &); - + void operator= (const IORInterceptor &); }; @@ -232,18 +232,18 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor> { - static ::PortableInterceptor::IORInterceptor_ptr tao_duplicate ( + static ::PortableInterceptor::IORInterceptor_ptr duplicate ( ::PortableInterceptor::IORInterceptor_ptr ); - static void tao_release ( + static void release ( ::PortableInterceptor::IORInterceptor_ptr ); - static ::PortableInterceptor::IORInterceptor_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ::PortableInterceptor::IORInterceptor_ptr nil (void); + static CORBA::Boolean marshal ( ::PortableInterceptor::IORInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -270,4 +270,3 @@ namespace TAO #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index 74988dbb0c6..8ab77cbb616 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" #include "tao/PI_ForwardC.h" namespace PortableInterceptor diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index 5b030bd87af..e56e7994296 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_IORInterceptor_Adapter; @@ -34,7 +34,7 @@ class TAO_IORInterceptor_Adapter; * ORB on the ORB's first usage of its ior_interceptor_adapter_. This is a base * class for the actual implementation in the TAO_IORInterceptor library. */ -class TAO_Export TAO_IORInterceptor_Adapter_Factory +class TAO_Export TAO_IORInterceptor_Adapter_Factory : public ACE_Service_Object { public: diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 1984a986857..2ee31f9dcb2 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -31,6 +31,7 @@ #include "IORTableC.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -50,7 +51,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::AlreadyBound::AlreadyBound (void) @@ -126,7 +127,7 @@ void IORTable::AlreadyBound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -139,13 +140,13 @@ void IORTable::AlreadyBound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::NotFound::NotFound (void) @@ -221,7 +222,7 @@ void IORTable::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -234,7 +235,7 @@ void IORTable::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -247,7 +248,7 @@ void IORTable::NotFound::_tao_decode ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Table_ptr -TAO::Objref_Traits<IORTable::Table>::tao_duplicate ( +TAO::Objref_Traits<IORTable::Table>::duplicate ( IORTable::Table_ptr p ) { @@ -256,7 +257,7 @@ TAO::Objref_Traits<IORTable::Table>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IORTable::Table>::tao_release ( +TAO::Objref_Traits<IORTable::Table>::release ( IORTable::Table_ptr p ) { @@ -265,14 +266,14 @@ TAO::Objref_Traits<IORTable::Table>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Table_ptr -TAO::Objref_Traits<IORTable::Table>::tao_nil (void) +TAO::Objref_Traits<IORTable::Table>::nil (void) { return IORTable::Table::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IORTable::Table>::tao_marshal ( +TAO::Objref_Traits<IORTable::Table>::marshal ( IORTable::Table_ptr p, TAO_OutputCDR & cdr ) @@ -281,7 +282,7 @@ TAO::Objref_Traits<IORTable::Table>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*IORTable__TAO_Table_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -302,10 +303,10 @@ IORTable::Table::_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -319,10 +320,10 @@ IORTable::Table::_unchecked_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -333,7 +334,7 @@ IORTable::Table::_duplicate (Table_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -384,7 +385,7 @@ IORTable::Table::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Locator_ptr -TAO::Objref_Traits<IORTable::Locator>::tao_duplicate ( +TAO::Objref_Traits<IORTable::Locator>::duplicate ( IORTable::Locator_ptr p ) { @@ -393,7 +394,7 @@ TAO::Objref_Traits<IORTable::Locator>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<IORTable::Locator>::tao_release ( +TAO::Objref_Traits<IORTable::Locator>::release ( IORTable::Locator_ptr p ) { @@ -402,14 +403,14 @@ TAO::Objref_Traits<IORTable::Locator>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION IORTable::Locator_ptr -TAO::Objref_Traits<IORTable::Locator>::tao_nil (void) +TAO::Objref_Traits<IORTable::Locator>::nil (void) { return IORTable::Locator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<IORTable::Locator>::tao_marshal ( +TAO::Objref_Traits<IORTable::Locator>::marshal ( IORTable::Locator_ptr p, TAO_OutputCDR & cdr ) @@ -418,7 +419,7 @@ TAO::Objref_Traits<IORTable::Locator>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*IORTable__TAO_Locator_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -439,10 +440,10 @@ IORTable::Locator::_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -456,10 +457,10 @@ IORTable::Locator::_unchecked_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -470,7 +471,7 @@ IORTable::Locator::_duplicate (Locator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -582,7 +583,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< IORTable::Locator >; - + template class TAO_Objref_Out_T< IORTable::Locator @@ -597,7 +598,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< IORTable::Table >; - + template class TAO_Objref_Out_T< IORTable::Table @@ -614,7 +615,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ IORTable::Locator > - + # pragma instantiate \ TAO_Objref_Out_T< \ IORTable::Locator @@ -629,11 +630,10 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ IORTable::Table > - + # pragma instantiate \ TAO_Objref_Out_T< \ IORTable::Table > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 4db02def81f..b2a199347c0 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -41,7 +41,7 @@ #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/Exception.h" +#include "tao/UserException.h" #include "tao/Objref_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) @@ -67,13 +67,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -83,22 +83,22 @@ namespace TAO namespace IORTable { - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_) #define _IORTABLE_LOCATOR__VAR_OUT_CH_ - + class Locator; typedef Locator *Locator_ptr; - + typedef TAO_Objref_Var_T< Locator > Locator_var; - + typedef TAO_Objref_Out_T< Locator @@ -106,23 +106,23 @@ namespace IORTable Locator_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_ALREADYBOUND_CH_) #define _IORTABLE_ALREADYBOUND_CH_ - + class TAO_IORTable_Export AlreadyBound : public CORBA::UserException { public: - + AlreadyBound (void); AlreadyBound (const AlreadyBound &); ~AlreadyBound (void); AlreadyBound &operator= (const AlreadyBound &); - + static AlreadyBound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -134,34 +134,34 @@ namespace IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IORTABLE_NOTFOUND_CH_) #define _IORTABLE_NOTFOUND_CH_ - + class TAO_IORTable_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static NotFound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -173,33 +173,33 @@ namespace IORTable TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_IORTABLE_TABLE__VAR_OUT_CH_) #define _IORTABLE_TABLE__VAR_OUT_CH_ - + class Table; typedef Table *Table_ptr; - + typedef TAO_Objref_Var_T< Table > Table_var; - + typedef TAO_Objref_Out_T< Table @@ -207,43 +207,43 @@ namespace IORTable Table_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_TABLE_CH_) #define _IORTABLE_TABLE_CH_ - + class TAO_IORTable_Export Table : public virtual CORBA::Object { public: typedef Table_ptr _ptr_type; typedef Table_var _var_type; - + // The static operations. static Table_ptr _duplicate (Table_ptr obj); - + static Table_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Table_ptr _nil (void) { return (Table_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bind ( const char * object_key, const char * IOR @@ -253,10 +253,10 @@ namespace IORTable CORBA::SystemException , IORTable::AlreadyBound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void rebind ( const char * object_key, const char * IOR @@ -265,10 +265,10 @@ namespace IORTable ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void unbind ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -277,10 +277,10 @@ namespace IORTable CORBA::SystemException , IORTable::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_locator ( IORTable::Locator_ptr the_locator ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -288,69 +288,69 @@ namespace IORTable ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Table (void); - + virtual ~Table (void); - + private: // Private and unimplemented for concrete interfaces. Table (const Table &); - + void operator= (const Table &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IORTABLE_LOCATOR_CH_) #define _IORTABLE_LOCATOR_CH_ - + class TAO_IORTable_Export Locator : public virtual CORBA::Object { public: typedef Locator_ptr _ptr_type; typedef Locator_var _var_type; - + // The static operations. static Locator_ptr _duplicate (Locator_ptr obj); - + static Locator_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Locator_ptr _nil (void) { return (Locator_ptr)0; } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * locate ( const char * object_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -359,28 +359,28 @@ namespace IORTable CORBA::SystemException , IORTable::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Locator (void); - + virtual ~Locator (void); - + private: // Private and unimplemented for concrete interfaces. Locator (const Locator &); - + void operator= (const Locator &); }; @@ -400,18 +400,18 @@ namespace TAO #if !defined (_IORTABLE_LOCATOR__TRAITS_CH_) #define _IORTABLE_LOCATOR__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits<IORTable::Locator> { - static IORTable::Locator_ptr tao_duplicate ( + static IORTable::Locator_ptr duplicate ( IORTable::Locator_ptr ); - static void tao_release ( + static void release ( IORTable::Locator_ptr ); - static IORTable::Locator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static IORTable::Locator_ptr nil (void); + static CORBA::Boolean marshal ( IORTable::Locator_ptr p, TAO_OutputCDR & cdr ); @@ -421,18 +421,18 @@ namespace TAO #if !defined (_IORTABLE_TABLE__TRAITS_CH_) #define _IORTABLE_TABLE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_IORTable_Export Objref_Traits<IORTable::Table> { - static IORTable::Table_ptr tao_duplicate ( + static IORTable::Table_ptr duplicate ( IORTable::Table_ptr ); - static void tao_release ( + static void release ( IORTable::Table_ptr ); - static IORTable::Table_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static IORTable::Table_ptr nil (void); + static CORBA::Boolean marshal ( IORTable::Table_ptr p, TAO_OutputCDR & cdr ); @@ -471,4 +471,3 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h index 8a2742c70ac..9fa4bbb727a 100644 --- a/TAO/tao/IOR_Parser.h +++ b/TAO/tao/IOR_Parser.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" namespace CORBA { diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp index d8d2f4ca80b..39bf41fe752 100644 --- a/TAO/tao/Interceptor_List.cpp +++ b/TAO/tao/Interceptor_List.cpp @@ -1,6 +1,7 @@ // $Id$ #include "tao/Interceptor_List.h" +#include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "ace/os_include/os_stddef.h" #include "ace/OS_NS_string.h" @@ -88,7 +89,7 @@ TAO_Interceptor_List::add_interceptor_i ( ACE_THROW_RETURN ( CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL ), CORBA::COMPLETED_NO diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index 66beadddff8..08b0253c9fe 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -4,6 +4,7 @@ #include "ORB_Core.h" #include "Typecode.h" #include "DynamicC.h" +#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 #include "RequestInfo_Util.h" diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 62fc3ab4f71..42a2075a302 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -6,6 +6,7 @@ #include "Base_Transport_Property.h" #include "Profile_Transport_Resolver.h" #include "ORB_Constants.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/Invocation_Endpoint_Selectors.i" diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index 3d752b69478..f561d37ae0d 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -8,7 +8,7 @@ # include "LocalObject.i" #endif /* ! __ACE_INLINE__ */ -#include "Exception.h" +#include "SystemException.h" #include "debug.h" #include "ORB_Constants.h" diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 0e60340a1e7..527999bff53 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -30,7 +30,7 @@ namespace TAO if (stub == 0) ACE_THROW (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index 3dd6957803d..6e761046cc3 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -6,6 +6,7 @@ #include "tao/Profile.h" #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" @@ -312,7 +313,7 @@ TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->policy_list_, CORBA::PolicyList, - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO) ); } @@ -352,7 +353,7 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL) CORBA::PolicyList *ret_val = 0; ACE_NEW_THROW_EX (ret_val, CORBA::PolicyList (*this->policy_list_), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 596191756d0..c80275366f3 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -11,6 +11,8 @@ #include "tao/GIOP_Utils.h" #include "tao/debug.h" #include "tao/Buffer_Allocator_T.h" +#include "tao/SystemException.h" + #include "ace/Copy_Disabled.h" TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () @@ -234,7 +236,7 @@ TAO_AMH_Response_Handler::_remove_ref (void) ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->refcount_lock_); - + --this->refcount_; if (this->refcount_ > 0) diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 89793da3ad9..31b5a52dcc6 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -60,65 +60,65 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f4578), - ACE_NTOHL (0x63657074), - ACE_NTOHL (0x696f6e48), - ACE_NTOHL (0x6f6c6465), - ACE_NTOHL (0x723a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f4578), + ACE_NTOHL (0x63657074), + ACE_NTOHL (0x696f6e48), + ACE_NTOHL (0x6f6c6465), + ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0 16, - ACE_NTOHL (0x45786365), - ACE_NTOHL (0x7074696f), - ACE_NTOHL (0x6e486f6c), + ACE_NTOHL (0x45786365), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200), // name = ExceptionHolder 0, // value modifier CORBA::tk_null, // no stateful base valuetype 3, // member count 20, - ACE_NTOHL (0x69735f73), - ACE_NTOHL (0x79737465), - ACE_NTOHL (0x6d5f6578), - ACE_NTOHL (0x63657074), + ACE_NTOHL (0x69735f73), + ACE_NTOHL (0x79737465), + ACE_NTOHL (0x6d5f6578), + ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = is_system_exception CORBA::tk_boolean, 1, // data member visibility marker 11, - ACE_NTOHL (0x62797465), - ACE_NTOHL (0x5f6f7264), + ACE_NTOHL (0x62797465), + ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000), // name = byte_order CORBA::tk_boolean, 1, // data member visibility marker 20, - ACE_NTOHL (0x6d617273), - ACE_NTOHL (0x68616c65), - ACE_NTOHL (0x645f6578), - ACE_NTOHL (0x63657074), + ACE_NTOHL (0x6d617273), + ACE_NTOHL (0x68616c65), + ACE_NTOHL (0x645f6578), + ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00), // name = marshaled_exception CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -149,7 +149,7 @@ namespace Messaging // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref ( Messaging::ExceptionHolder * p @@ -158,7 +158,7 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref ( CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref ( Messaging::ExceptionHolder * p @@ -167,9 +167,9 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref ( CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<Messaging::ExceptionHolder>::tao_release ( +TAO::Value_Traits<Messaging::ExceptionHolder>::release ( Messaging::ExceptionHolder * p ) { @@ -183,7 +183,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::Messaging::ExceptionHolder * > (v); } @@ -228,29 +228,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal ( base, ExceptionHolder::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ExceptionHolder::_downcast (base); @@ -268,7 +268,7 @@ Messaging::ExceptionHolder_init::~ExceptionHolder_init (void) { } -const char* +const char* Messaging::ExceptionHolder_init::tao_repository_id (void) { return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id (); @@ -293,7 +293,7 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyHandler_ptr -TAO::Objref_Traits<Messaging::ReplyHandler>::tao_duplicate ( +TAO::Objref_Traits<Messaging::ReplyHandler>::duplicate ( Messaging::ReplyHandler_ptr p ) { @@ -302,7 +302,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyHandler>::tao_release ( +TAO::Objref_Traits<Messaging::ReplyHandler>::release ( Messaging::ReplyHandler_ptr p ) { @@ -311,14 +311,14 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyHandler_ptr -TAO::Objref_Traits<Messaging::ReplyHandler>::tao_nil (void) +TAO::Objref_Traits<Messaging::ReplyHandler>::nil (void) { return Messaging::ReplyHandler::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyHandler>::tao_marshal ( +TAO::Objref_Traits<Messaging::ReplyHandler>::marshal ( Messaging::ReplyHandler_ptr p, TAO_OutputCDR & cdr ) @@ -327,7 +327,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -351,7 +351,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation () Messaging::ReplyHandler::~ReplyHandler (void) {} -void +void Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer) { ReplyHandler *_tao_tmp_pointer = @@ -396,7 +396,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -446,20 +446,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x706c7948), - ACE_NTOHL (0x616e646c), - ACE_NTOHL (0x65723a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x706c7948), + ACE_NTOHL (0x616e646c), + ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0 13, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x7948616e), - ACE_NTOHL (0x646c6572), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x7948616e), + ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler }; @@ -762,21 +762,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -793,13 +793,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< Messaging::ExceptionHolder - + >; - + template class TAO_Value_Out_T< Messaging::ExceptionHolder - + >; template class @@ -816,7 +816,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< Messaging::ReplyHandler >; - + template class TAO_Objref_Out_T< Messaging::ReplyHandler @@ -842,13 +842,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ Messaging::ExceptionHolder \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ Messaging::ExceptionHolder \ - + > # pragma instantiate \ @@ -865,7 +865,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ Messaging::ReplyHandler > - + # pragma instantiate \ TAO_Objref_Out_T< \ Messaging::ReplyHandler @@ -881,5 +881,4 @@ CORBA::Boolean operator>> ( Messaging::ReplyHandler \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index 34595011524..da218e55e7d 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -419,7 +419,7 @@ namespace TAO { static void tao_add_ref (Messaging::ExceptionHolder *); static void tao_remove_ref (Messaging::ExceptionHolder *); - static void tao_release (Messaging::ExceptionHolder *); + static void release (Messaging::ExceptionHolder *); }; #endif /* end #if !defined */ @@ -430,14 +430,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler> { - static Messaging::ReplyHandler_ptr tao_duplicate ( + static Messaging::ReplyHandler_ptr duplicate ( Messaging::ReplyHandler_ptr ); - static void tao_release ( + static void release ( Messaging::ReplyHandler_ptr ); - static Messaging::ReplyHandler_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::ReplyHandler_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::ReplyHandler_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 4c3c75a122e..c6ba7f3fc9b 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -214,7 +214,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RebindPolicy_ptr -TAO::Objref_Traits<Messaging::RebindPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RebindPolicy>::duplicate ( Messaging::RebindPolicy_ptr p ) { @@ -223,7 +223,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RebindPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RebindPolicy>::release ( Messaging::RebindPolicy_ptr p ) { @@ -232,14 +232,14 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RebindPolicy_ptr -TAO::Objref_Traits<Messaging::RebindPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RebindPolicy>::nil (void) { return Messaging::RebindPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RebindPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RebindPolicy>::marshal ( Messaging::RebindPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -497,7 +497,7 @@ Messaging::PriorityRange::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::duplicate ( Messaging::RequestPriorityPolicy_ptr p ) { @@ -506,7 +506,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release ( Messaging::RequestPriorityPolicy_ptr p ) { @@ -515,14 +515,14 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::nil (void) { return Messaging::RequestPriorityPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::marshal ( Messaging::RequestPriorityPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -688,7 +688,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::duplicate ( Messaging::ReplyPriorityPolicy_ptr p ) { @@ -697,7 +697,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release ( Messaging::ReplyPriorityPolicy_ptr p ) { @@ -706,14 +706,14 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyPriorityPolicy_ptr -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::nil (void) { return Messaging::ReplyPriorityPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::marshal ( Messaging::ReplyPriorityPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -878,7 +878,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::duplicate ( Messaging::RequestStartTimePolicy_ptr p ) { @@ -887,7 +887,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release ( Messaging::RequestStartTimePolicy_ptr p ) { @@ -896,14 +896,14 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::nil (void) { return Messaging::RequestStartTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::marshal ( Messaging::RequestStartTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1070,7 +1070,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::duplicate ( Messaging::RequestEndTimePolicy_ptr p ) { @@ -1079,7 +1079,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release ( Messaging::RequestEndTimePolicy_ptr p ) { @@ -1088,14 +1088,14 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RequestEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::nil (void) { return Messaging::RequestEndTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::marshal ( Messaging::RequestEndTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1261,7 +1261,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::duplicate ( Messaging::ReplyStartTimePolicy_ptr p ) { @@ -1270,7 +1270,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_release ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release ( Messaging::ReplyStartTimePolicy_ptr p ) { @@ -1279,14 +1279,14 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyStartTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::nil (void) { return Messaging::ReplyStartTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::marshal ( Messaging::ReplyStartTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1452,7 +1452,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::duplicate ( Messaging::ReplyEndTimePolicy_ptr p ) { @@ -1461,7 +1461,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_release ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release ( Messaging::ReplyEndTimePolicy_ptr p ) { @@ -1470,14 +1470,14 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::ReplyEndTimePolicy_ptr -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::nil (void) { return Messaging::ReplyEndTimePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::marshal ( Messaging::ReplyEndTimePolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1642,7 +1642,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRequestTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::duplicate ( Messaging::RelativeRequestTimeoutPolicy_ptr p ) { @@ -1651,7 +1651,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release ( Messaging::RelativeRequestTimeoutPolicy_ptr p ) { @@ -1660,14 +1660,14 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRequestTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::nil (void) { return Messaging::RelativeRequestTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::marshal ( Messaging::RelativeRequestTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1937,7 +1937,7 @@ Messaging::RoutingTypeRange::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RoutingPolicy_ptr -TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::duplicate ( Messaging::RoutingPolicy_ptr p ) { @@ -1946,7 +1946,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::release ( Messaging::RoutingPolicy_ptr p ) { @@ -1955,14 +1955,14 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RoutingPolicy_ptr -TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RoutingPolicy>::nil (void) { return Messaging::RoutingPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RoutingPolicy>::marshal ( Messaging::RoutingPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -2124,7 +2124,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::MaxHopsPolicy_ptr -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::duplicate ( Messaging::MaxHopsPolicy_ptr p ) { @@ -2133,7 +2133,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release ( Messaging::MaxHopsPolicy_ptr p ) { @@ -2142,14 +2142,14 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::MaxHopsPolicy_ptr -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::nil (void) { return Messaging::MaxHopsPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::MaxHopsPolicy>::marshal ( Messaging::MaxHopsPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -2311,7 +2311,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::QueueOrderPolicy_ptr -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::duplicate ( Messaging::QueueOrderPolicy_ptr p ) { @@ -2320,7 +2320,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release ( Messaging::QueueOrderPolicy_ptr p ) { @@ -2329,14 +2329,14 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::QueueOrderPolicy_ptr -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::nil (void) { return Messaging::QueueOrderPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::QueueOrderPolicy>::marshal ( Messaging::QueueOrderPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index f85f397cfe4..ae675e406e1 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -1612,14 +1612,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RebindPolicy> { - static Messaging::RebindPolicy_ptr tao_duplicate ( + static Messaging::RebindPolicy_ptr duplicate ( Messaging::RebindPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RebindPolicy_ptr ); - static Messaging::RebindPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RebindPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RebindPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1633,14 +1633,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestPriorityPolicy> { - static Messaging::RequestPriorityPolicy_ptr tao_duplicate ( + static Messaging::RequestPriorityPolicy_ptr duplicate ( Messaging::RequestPriorityPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RequestPriorityPolicy_ptr ); - static Messaging::RequestPriorityPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RequestPriorityPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RequestPriorityPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1654,14 +1654,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyPriorityPolicy> { - static Messaging::ReplyPriorityPolicy_ptr tao_duplicate ( + static Messaging::ReplyPriorityPolicy_ptr duplicate ( Messaging::ReplyPriorityPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::ReplyPriorityPolicy_ptr ); - static Messaging::ReplyPriorityPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::ReplyPriorityPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::ReplyPriorityPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1675,14 +1675,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestStartTimePolicy> { - static Messaging::RequestStartTimePolicy_ptr tao_duplicate ( + static Messaging::RequestStartTimePolicy_ptr duplicate ( Messaging::RequestStartTimePolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RequestStartTimePolicy_ptr ); - static Messaging::RequestStartTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RequestStartTimePolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RequestStartTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1696,14 +1696,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RequestEndTimePolicy> { - static Messaging::RequestEndTimePolicy_ptr tao_duplicate ( + static Messaging::RequestEndTimePolicy_ptr duplicate ( Messaging::RequestEndTimePolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RequestEndTimePolicy_ptr ); - static Messaging::RequestEndTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RequestEndTimePolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RequestEndTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1717,14 +1717,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyStartTimePolicy> { - static Messaging::ReplyStartTimePolicy_ptr tao_duplicate ( + static Messaging::ReplyStartTimePolicy_ptr duplicate ( Messaging::ReplyStartTimePolicy_ptr ); - static void tao_release ( + static void release ( Messaging::ReplyStartTimePolicy_ptr ); - static Messaging::ReplyStartTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::ReplyStartTimePolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::ReplyStartTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1738,14 +1738,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyEndTimePolicy> { - static Messaging::ReplyEndTimePolicy_ptr tao_duplicate ( + static Messaging::ReplyEndTimePolicy_ptr duplicate ( Messaging::ReplyEndTimePolicy_ptr ); - static void tao_release ( + static void release ( Messaging::ReplyEndTimePolicy_ptr ); - static Messaging::ReplyEndTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::ReplyEndTimePolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::ReplyEndTimePolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1759,14 +1759,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> { - static Messaging::RelativeRequestTimeoutPolicy_ptr tao_duplicate ( + static Messaging::RelativeRequestTimeoutPolicy_ptr duplicate ( Messaging::RelativeRequestTimeoutPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RelativeRequestTimeoutPolicy_ptr ); - static Messaging::RelativeRequestTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RelativeRequestTimeoutPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RelativeRequestTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1780,14 +1780,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RoutingPolicy> { - static Messaging::RoutingPolicy_ptr tao_duplicate ( + static Messaging::RoutingPolicy_ptr duplicate ( Messaging::RoutingPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RoutingPolicy_ptr ); - static Messaging::RoutingPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RoutingPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RoutingPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1801,14 +1801,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::MaxHopsPolicy> { - static Messaging::MaxHopsPolicy_ptr tao_duplicate ( + static Messaging::MaxHopsPolicy_ptr duplicate ( Messaging::MaxHopsPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::MaxHopsPolicy_ptr ); - static Messaging::MaxHopsPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::MaxHopsPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::MaxHopsPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -1822,14 +1822,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::QueueOrderPolicy> { - static Messaging::QueueOrderPolicy_ptr tao_duplicate ( + static Messaging::QueueOrderPolicy_ptr duplicate ( Messaging::QueueOrderPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::QueueOrderPolicy_ptr ); - static Messaging::QueueOrderPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::QueueOrderPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::QueueOrderPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 7fdcf3225e8..0dc6d2c6603 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -112,7 +112,7 @@ namespace Messaging ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRoundtripTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::duplicate ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p ) { @@ -121,7 +121,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_release ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p ) { @@ -130,14 +130,14 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::RelativeRoundtripTimeoutPolicy_ptr -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::nil (void) { return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::marshal ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index bc35afd3dec..77d5c0fbe8a 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -238,14 +238,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> { - static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_duplicate ( + static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate ( Messaging::RelativeRoundtripTimeoutPolicy_ptr ); - static void tao_release ( + static void release ( Messaging::RelativeRoundtripTimeoutPolicy_ptr ); - static Messaging::RelativeRoundtripTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index bf5c226f661..2258328fd35 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -59,7 +59,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::SyncScopePolicy_ptr -TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_duplicate ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::duplicate ( Messaging::SyncScopePolicy_ptr p ) { @@ -68,7 +68,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_release ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::release ( Messaging::SyncScopePolicy_ptr p ) { @@ -77,14 +77,14 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION Messaging::SyncScopePolicy_ptr -TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_nil (void) +TAO::Objref_Traits<Messaging::SyncScopePolicy>::nil (void) { return Messaging::SyncScopePolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_marshal ( +TAO::Objref_Traits<Messaging::SyncScopePolicy>::marshal ( Messaging::SyncScopePolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index b901877a1ec..bfd072dec95 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -227,14 +227,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<Messaging::SyncScopePolicy> { - static Messaging::SyncScopePolicy_ptr tao_duplicate ( + static Messaging::SyncScopePolicy_ptr duplicate ( Messaging::SyncScopePolicy_ptr ); - static void tao_release ( + static void release ( Messaging::SyncScopePolicy_ptr ); - static Messaging::SyncScopePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static Messaging::SyncScopePolicy_ptr nil (void); + static CORBA::Boolean marshal ( Messaging::SyncScopePolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 14de8ef1ea2..0f031d2aa95 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -59,7 +59,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::ConnectionTimeoutPolicy_ptr -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_duplicate ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::duplicate ( TAO::ConnectionTimeoutPolicy_ptr p ) { @@ -68,7 +68,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_release ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release ( TAO::ConnectionTimeoutPolicy_ptr p ) { @@ -77,14 +77,14 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::ConnectionTimeoutPolicy_ptr -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_nil (void) +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::nil (void) { return TAO::ConnectionTimeoutPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_marshal ( +TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::marshal ( TAO::ConnectionTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 8840f468313..738074f3f37 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -227,14 +227,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Messaging_Export Objref_Traits<TAO::ConnectionTimeoutPolicy> { - static TAO::ConnectionTimeoutPolicy_ptr tao_duplicate ( + static TAO::ConnectionTimeoutPolicy_ptr duplicate ( TAO::ConnectionTimeoutPolicy_ptr ); - static void tao_release ( + static void release ( TAO::ConnectionTimeoutPolicy_ptr ); - static TAO::ConnectionTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static TAO::ConnectionTimeoutPolicy_ptr nil (void); + static CORBA::Boolean marshal ( TAO::ConnectionTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 09378a0ba4d..fdfb2213e16 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -5,13 +5,14 @@ #include "NVList.h" +#include "tao/SystemException.h" #include "tao/BoundsC.h" -#include "tao/debug.h" #include "tao/Typecode.h" #include "tao/Marshal.h" #include "tao/CORBA_String.h" #include "tao/Any_Impl.h" #include "tao/CDR.h" +#include "tao/debug.h" #include "ace/Auto_Ptr.h" @@ -243,7 +244,7 @@ CORBA::NVList::add_element (CORBA::Flags flags if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (), + ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::NamedValue::_nil ()); } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 06e158f02e5..19efaeb09b6 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -27,6 +27,7 @@ ACE_RCSID (tao, #include "TypeCodeFactory_Adapter.h" #include "debug.h" #include "CDR.h" +#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 # include "PICurrent_ORBInitializer.h" /* @@ This should go away! */ @@ -178,7 +179,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } @@ -290,7 +291,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -307,7 +308,7 @@ CORBA::ORB::create_list (CORBA::Long count, CORBA::NamedValue, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -360,7 +361,7 @@ CORBA::ORB::create_environment (CORBA::Environment_ptr &environment CORBA::Environment (), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); } @@ -373,7 +374,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv CORBA::NamedValue, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); } @@ -389,7 +390,7 @@ CORBA::ORB::get_service_information ( { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -401,7 +402,7 @@ CORBA::ORB::create_context_list (CORBA::ContextList_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -412,7 +413,7 @@ CORBA::ORB::get_default_context (CORBA::Context_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -423,7 +424,7 @@ CORBA::ORB::send_multiple_requests_oneway (const CORBA::ORB::RequestSeq & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -434,7 +435,7 @@ CORBA::ORB::send_multiple_requests_deferred (const CORBA::ORB::RequestSeq & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -445,7 +446,7 @@ CORBA::ORB::get_next_response (CORBA::Request_ptr & { ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); } @@ -455,7 +456,7 @@ CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -1287,7 +1288,7 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) // CORBA::OBJECT_NOT_EXIST exception if the ORB has been // destroyed by the time an ORB function is called. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } } @@ -1366,7 +1367,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) TAO_CodecFactory_ORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -1393,7 +1394,7 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) TAO_PICurrent_ORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -1514,7 +1515,7 @@ CORBA::ORB_init (int &argc, { ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1589,7 +1590,7 @@ CORBA::ORB_init (int &argc, TAO_ORB_Core (orbid_string.c_str ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); @@ -1628,7 +1629,7 @@ CORBA::ORB_init (int &argc, command_line.get_ASCII_argv()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); @@ -1654,7 +1655,7 @@ CORBA::ORB_init (int &argc, if (result == -1) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1684,7 +1685,7 @@ CORBA::ORB_init (int &argc, // Before returning remember to store the ORB into the table... if (TAO_ORB_Table::instance ()->bind (orbid_string.c_str (), safe_oc.get ()) != 0) - ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::INTERNAL (0, CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); @@ -1805,7 +1806,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), 0); @@ -1823,7 +1824,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), 0); @@ -1851,7 +1852,7 @@ CORBA::ORB::string_to_object (const char *str if (str == 0) ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); @@ -2010,7 +2011,7 @@ CORBA::ORB::url_ior_string_to_object (const char* str { ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), CORBA::Object::_nil ()); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 6d53e9498fc..9a1621ca7c1 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -9,7 +9,7 @@ * Header file for CORBA's ORB type. * * @author Copyright 1994-1995 by Sun Microsystems Inc. - * @author Douglas C. Schmidt <schmidt@uci.edu> + * @author Douglas C. Schmidt <schmidt@dre.vanderbilt.edu.edu> */ //============================================================================= @@ -18,12 +18,13 @@ #include /**/ "ace/pre.h" -#include "Exception.h" +#include "SystemException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "UserException.h" #include "objectid.h" #include "PolicyC.h" #include "OBV_Constants.h" diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp index f1e6ddf23ef..1ff36512203 100644 --- a/TAO/tao/ORBInitInfo.cpp +++ b/TAO/tao/ORBInitInfo.cpp @@ -4,6 +4,7 @@ #include "ORB_Core.h" #include "ORB.h" #include "CodecFactory.h" +#include "SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 #include "PICurrent.h" @@ -22,7 +23,7 @@ ACE_RCSID (TAO, // Traits specializations for TAO_ORBInitInfo. TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::tao_duplicate ( +TAO::Objref_Traits<TAO_ORBInitInfo>::duplicate ( TAO_ORBInitInfo_ptr p ) { @@ -30,7 +31,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::tao_duplicate ( } void -TAO::Objref_Traits<TAO_ORBInitInfo>::tao_release ( +TAO::Objref_Traits<TAO_ORBInitInfo>::release ( TAO_ORBInitInfo_ptr p ) { @@ -38,13 +39,13 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::tao_release ( } TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::tao_nil (void) +TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void) { return TAO_ORBInitInfo::_nil (); } CORBA::Boolean -TAO::Objref_Traits<TAO_ORBInitInfo>::tao_marshal ( +TAO::Objref_Traits<TAO_ORBInitInfo>::marshal ( TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr ) @@ -82,7 +83,7 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL) CORBA::StringSeq, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -125,7 +126,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL) TAO_CodecFactory (this->orb_core_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (IOP::CodecFactory::_nil ()); @@ -201,7 +202,7 @@ TAO_ORBInitInfo::add_client_request_interceptor ( ACE_UNUSED_ARG (interceptor); ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -225,7 +226,7 @@ TAO_ORBInitInfo::add_server_request_interceptor ( ACE_UNUSED_ARG (interceptor); ACE_THROW (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO)); #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -259,7 +260,7 @@ TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL) #else ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOTSUP), CORBA::COMPLETED_NO), 0); @@ -300,7 +301,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup if (result != 0) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, errno), CORBA::COMPLETED_NO), 0); @@ -319,7 +320,7 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL) // this instance to zero when it is done initializing the ORB, // which is why we base "existence" on the validity of the ORB // core pointer. - ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h index 6b18c942d12..cd4a6c0a3df 100644 --- a/TAO/tao/ORBInitInfo.h +++ b/TAO/tao/ORBInitInfo.h @@ -277,14 +277,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<TAO_ORBInitInfo> { - static TAO_ORBInitInfo_ptr tao_duplicate ( + static TAO_ORBInitInfo_ptr duplicate ( TAO_ORBInitInfo_ptr ); - static void tao_release ( + static void release ( TAO_ORBInitInfo_ptr ); - static TAO_ORBInitInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static TAO_ORBInitInfo_ptr nil (void); + static CORBA::Boolean marshal ( TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 55ee065b5eb..4a7aa25a200 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -4,6 +4,7 @@ #include "TAO_Singleton.h" #include "ORB_Constants.h" #include "TAO_Singleton_Manager.h" +#include "SystemException.h" #include "ace/Static_Object_Lock.h" @@ -73,7 +74,7 @@ TAO_ORBInitializer_Registry::register_orb_initializer ( else ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index bfc77ab79ae..f32effcf875 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2036,6 +2036,20 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL) } void +TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) +{ + if (this->has_shutdown ()) + { + // As defined by the CORBA 2.3 specification, throw a + // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB + // has shutdown by the time an ORB function is called. + + ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, + CORBA::COMPLETED_NO)); + } +} + +void TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 7f9170af8dd..76be478d42a 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -339,21 +339,6 @@ TAO_ORB_Core::has_shutdown (void) return this->has_shutdown_; } -ACE_INLINE void -TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL) -{ - if (this->has_shutdown ()) - { - // As defined by the CORBA 2.3 specification, throw a - // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB - // has shutdown by the time an ORB function is called. - - ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, - CORBA::COMPLETED_NO)); - } -} - - ACE_INLINE int TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const { diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp index 030e2282cb1..60aeb7eed9d 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp @@ -59,24 +59,24 @@ static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x54414f5f), - ACE_NTOHL (0x44656661), - ACE_NTOHL (0x756c745f), - ACE_NTOHL (0x4f52542f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x54414f5f), + ACE_NTOHL (0x44656661), + ACE_NTOHL (0x756c745f), + ACE_NTOHL (0x4f52542f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 0, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -101,27 +101,27 @@ namespace TAO_Default_ORT // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref ( +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::add_ref ( TAO_Default_ORT::ObjectReferenceTemplate * p ) { CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref ( +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::remove_ref ( TAO_Default_ORT::ObjectReferenceTemplate * p ) { CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_release ( +TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::release ( TAO_Default_ORT::ObjectReferenceTemplate * p ) { @@ -135,7 +135,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::TAO_Default_ORT::ObjectReferenceTemplate * > (v); } @@ -180,29 +180,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal ( base, ObjectReferenceTemplate::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceTemplate::_downcast (base); @@ -370,13 +370,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR template class TAO_Value_Var_T< TAO_Default_ORT::ObjectReferenceTemplate - + >; - + template class TAO_Value_Out_T< TAO_Default_ORT::ObjectReferenceTemplate - + >; template class @@ -394,13 +394,13 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR # pragma instantiate \ TAO_Value_Var_T< \ TAO_Default_ORT::ObjectReferenceTemplate \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ TAO_Default_ORT::ObjectReferenceTemplate \ - + > # pragma instantiate \ @@ -408,5 +408,4 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR TAO_Default_ORT::ObjectReferenceTemplate \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index 9a3d1b72180..7588135a1a8 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -206,9 +206,9 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_ORT_Export Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate> { - static void tao_add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); - static void tao_remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); - static void tao_release (TAO_Default_ORT::ObjectReferenceTemplate *); + static void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + static void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *); + static void release (TAO_Default_ORT::ObjectReferenceTemplate *); }; #endif /* end #if !defined */ @@ -254,4 +254,3 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 5c011c5ecc2..7ae8e3c69bc 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -56,13 +56,13 @@ // Arg traits specializations. namespace TAO { - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:379 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_) #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_ - + ACE_TEMPLATE_SPECIALIZATION class TAO_ORT_Export Arg_Traits<CORBA::StringSeq> : public @@ -85,27 +85,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), - ACE_NTOHL (0x72793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x72793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0 23, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636546), - ACE_NTOHL (0x6163746f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636546), + ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -130,27 +130,27 @@ namespace PortableInterceptor // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::add_ref ( PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::remove_ref ( PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_release ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::release ( PortableInterceptor::ObjectReferenceFactory * p ) { @@ -164,7 +164,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v); } @@ -199,29 +199,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal ( base, ObjectReferenceFactory::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceFactory::_downcast (base); @@ -235,27 +235,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype @@ -280,27 +280,27 @@ namespace PortableInterceptor // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:66 -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::add_ref ( PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::add_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::remove_ref ( PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::remove_ref (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_release ( +TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::release ( PortableInterceptor::ObjectReferenceTemplate * p ) { @@ -314,7 +314,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) { return 0; } - + return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v); } @@ -349,36 +349,36 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal ( base, ObjectReferenceTemplate::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceTemplate::_downcast (base); return retval; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) @@ -441,29 +441,29 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 63, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0 27, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x61746553), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x61746553), ACE_NTOHL (0x65710000), // name = ObjectReferenceTemplateSeq CORBA::tk_sequence, // typecode kind 124, // encapsulation length @@ -472,33 +472,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] = 480, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72636570), + ACE_NTOHL (0x746f722f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0 24, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63745265), - ACE_NTOHL (0x66657265), - ACE_NTOHL (0x6e636554), - ACE_NTOHL (0x656d706c), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63745265), + ACE_NTOHL (0x66657265), + ACE_NTOHL (0x6e636554), + ACE_NTOHL (0x656d706c), ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate 2, // value modifier CORBA::tk_null, // no stateful base valuetype 3, // member count - + 0U, }; @@ -629,7 +629,7 @@ operator>>= ( -// TAO_IDL - Generated from +// TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -803,20 +803,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -826,7 +826,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -836,28 +836,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -890,13 +890,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< PortableInterceptor::ObjectReferenceFactory - + >; - + template class TAO_Value_Out_T< PortableInterceptor::ObjectReferenceFactory - + >; template class @@ -918,13 +918,13 @@ CORBA::Boolean operator>> ( template class TAO_Value_Var_T< PortableInterceptor::ObjectReferenceTemplate - + >; - + template class TAO_Value_Out_T< PortableInterceptor::ObjectReferenceTemplate - + >; template class @@ -1006,13 +1006,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ PortableInterceptor::ObjectReferenceFactory \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ PortableInterceptor::ObjectReferenceFactory \ - + > # pragma instantiate \ @@ -1034,13 +1034,13 @@ CORBA::Boolean operator>> ( # pragma instantiate \ TAO_Value_Var_T< \ PortableInterceptor::ObjectReferenceTemplate \ - + > - + # pragma instantiate \ TAO_Value_Out_T< \ PortableInterceptor::ObjectReferenceTemplate \ - + > # pragma instantiate \ @@ -1092,5 +1092,4 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index b012e1941d6..d2a256eac7d 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -82,22 +82,22 @@ namespace PortableInterceptor { - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527 - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_ - + class ObjectReferenceFactory; typedef TAO_Value_Var_T< ObjectReferenceFactory > ObjectReferenceFactory_var; - + typedef TAO_Value_Out_T< ObjectReferenceFactory @@ -105,78 +105,78 @@ namespace PortableInterceptor ObjectReferenceFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ - + class TAO_ORT_Export ObjectReferenceFactory : public virtual CORBA::ValueBase { public: typedef ObjectReferenceFactory_var _var_type; - + static ObjectReferenceFactory* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceFactory *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + public: virtual CORBA::Object_ptr make_object ( const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250 - + protected: ObjectReferenceFactory (void); - + virtual ~ObjectReferenceFactory (void); - - + + private: ObjectReferenceFactory (const ObjectReferenceFactory &); void operator= (const ObjectReferenceFactory &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:527 - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_ - + class ObjectReferenceTemplate; typedef TAO_Value_Var_T< ObjectReferenceTemplate > ObjectReferenceTemplate_var; - + typedef TAO_Value_Out_T< ObjectReferenceTemplate @@ -184,87 +184,87 @@ namespace PortableInterceptor ObjectReferenceTemplate_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ - + class TAO_ORT_Export ObjectReferenceTemplate : public virtual ObjectReferenceFactory { public: typedef ObjectReferenceTemplate_var _var_type; - + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceTemplate *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + public: virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + public: virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:402 - + public: virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:250 - + protected: ObjectReferenceTemplate (void); - + virtual ~ObjectReferenceTemplate (void); - - + + private: ObjectReferenceTemplate (const ObjectReferenceTemplate &); void operator= (const ObjectReferenceTemplate &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - + class ObjectReferenceTemplateSeq; - + typedef TAO_MngSeq_Var_T< ObjectReferenceTemplateSeq, @@ -274,7 +274,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_var; - + typedef TAO_MngSeq_Out_T< ObjectReferenceTemplateSeq, @@ -285,7 +285,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_out; - + class TAO_ORT_Export ObjectReferenceTemplateSeq : public TAO_Unbounded_Valuetype_Sequence< @@ -299,22 +299,22 @@ namespace PortableInterceptor ObjectReferenceTemplateSeq ( CORBA::ULong max, CORBA::ULong length, - ObjectReferenceTemplate ** buffer, + ObjectReferenceTemplate ** buffer, CORBA::Boolean release = 0 ); ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); ~ObjectReferenceTemplateSeq (void); - + static void _tao_any_destructor (void *); - + typedef ObjectReferenceTemplateSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; // TAO_IDL - Generated from @@ -338,26 +338,26 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory> { - static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *); - static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *); - static void tao_release (PortableInterceptor::ObjectReferenceFactory *); + static void add_ref (PortableInterceptor::ObjectReferenceFactory *); + static void remove_ref (PortableInterceptor::ObjectReferenceFactory *); + static void release (PortableInterceptor::ObjectReferenceFactory *); }; #endif /* end #if !defined */ #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate> { - static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *); - static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *); - static void tao_release (PortableInterceptor::ObjectReferenceTemplate *); + static void add_ref (PortableInterceptor::ObjectReferenceTemplate *); + static void remove_ref (PortableInterceptor::ObjectReferenceTemplate *); + static void release (PortableInterceptor::ObjectReferenceTemplate *); }; #endif /* end #if !defined */ @@ -450,4 +450,3 @@ TAO_ORT_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index df57f09aed8..44e308484bc 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -17,6 +17,7 @@ #include "IFR_Client_Adapter.h" #include "Remote_Object_Proxy_Broker.h" #include "CDR.h" +#include "SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" @@ -301,7 +302,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), 0); @@ -540,7 +541,7 @@ CORBA::Object::_set_policy_overrides ( this->is_collocated_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -926,26 +927,26 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) namespace TAO { CORBA::Object_ptr - Objref_Traits<CORBA::Object>::tao_duplicate (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::duplicate (CORBA::Object_ptr p) { return CORBA::Object::_duplicate (p); } void - Objref_Traits<CORBA::Object>::tao_release (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p) { CORBA::release (p); } CORBA::Object_ptr - Objref_Traits<CORBA::Object>::tao_nil (void) + Objref_Traits<CORBA::Object>::nil (void) { return CORBA::Object::_nil (); } CORBA::Boolean - Objref_Traits<CORBA::Object>::tao_marshal (CORBA::Object_ptr p, - TAO_OutputCDR & cdr) + Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p, + TAO_OutputCDR & cdr) { return p->marshal (cdr); } diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index fb0a3b1af07..abe40a97ce6 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -422,11 +422,11 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Object> { - static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr); - static void tao_release (CORBA::Object_ptr); - static CORBA::Object_ptr tao_nil (void); - static CORBA::Boolean tao_marshal (CORBA::Object_ptr p, - TAO_OutputCDR & cdr); + static CORBA::Object_ptr duplicate (CORBA::Object_ptr); + static void release (CORBA::Object_ptr); + static CORBA::Object_ptr nil (void); + static CORBA::Boolean marshal (CORBA::Object_ptr p, + TAO_OutputCDR & cdr); }; /** diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp index bae71e85137..db3a85f5329 100644 --- a/TAO/tao/Object_Argument_T.cpp +++ b/TAO/tao/Object_Argument_T.cpp @@ -46,7 +46,7 @@ template<typename S_ptr, typename S_traits> CORBA::Boolean TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr) { - S_traits::tao_release (this->x_); + S_traits::release (this->x_); return cdr >> this->x_; } diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index 23aedad01ef..f5293c48b40 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -18,7 +18,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" namespace CORBA { diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index d39df133941..cdaadc12f66 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -3,6 +3,7 @@ #include "Environment.h" #include "debug.h" #include "ORB_Constants.h" +#include "SystemException.h" #include "ace/OS_NS_string.h" ACE_RCSID (tao, diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 663b1a6a7c5..53bf34d07fb 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -2,8 +2,9 @@ #ifndef TAO_OBJECT_T_C #define TAO_OBJECT_T_C -#include "Object_T.h" -#include "Stub.h" +#include "tao/Object_T.h" +#include "tao/Stub.h" +#include "tao/SystemException.h" ACE_RCSID (tao, Object_T, diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index 1449d935ff6..7da5ea26bc6 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -15,7 +15,7 @@ ACE_RCSID (tao, template <typename T> TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) - : ptr_ (TAO::Objref_Traits<T>::tao_nil ()) + : ptr_ (TAO::Objref_Traits<T>::nil ()) { } @@ -24,21 +24,21 @@ TAO_Objref_Var_T<T>::TAO_Objref_Var_T ( const TAO_Objref_Var_T<T> & p ) : TAO_Base_var (), - ptr_ (TAO::Objref_Traits<T>::tao_duplicate (p.ptr ())) + ptr_ (TAO::Objref_Traits<T>::duplicate (p.ptr ())) { } template <typename T> TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); + TAO::Objref_Traits<T>::release (this->ptr_); } template <typename T> TAO_Objref_Var_T<T> & TAO_Objref_Var_T<T>::operator= (T * p) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); + TAO::Objref_Traits<T>::release (this->ptr_); this->ptr_ = p; return *this; } @@ -51,8 +51,8 @@ TAO_Objref_Var_T<T>::operator= ( { if (this != &p) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()); + TAO::Objref_Traits<T>::release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ()); } return *this; @@ -95,8 +95,8 @@ template <typename T> T *& TAO_Objref_Var_T<T>::out (void) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::nil (); return this->ptr_; } @@ -105,7 +105,7 @@ T * TAO_Objref_Var_T<T>::_retn (void) { T * val = this->ptr_; - this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + this->ptr_ = TAO::Objref_Traits<T>::nil (); return val; } @@ -120,14 +120,14 @@ template <typename T> void TAO_Objref_Var_T<T>::free (void) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); + TAO::Objref_Traits<T>::release (this->ptr_); } template <typename T> void TAO_Objref_Var_T<T>::reset (T * p) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); + TAO::Objref_Traits<T>::release (this->ptr_); this->ptr_ = p; } @@ -137,7 +137,7 @@ template <typename T> TAO_Objref_Out_T<T>::TAO_Objref_Out_T (T *& p) : ptr_ (p) { - this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + this->ptr_ = TAO::Objref_Traits<T>::nil (); } template <typename T> @@ -146,8 +146,8 @@ TAO_Objref_Out_T<T>::TAO_Objref_Out_T ( ) : ptr_ (p.out ()) { - TAO::Objref_Traits<T>::tao_release (this->ptr_); - this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (this->ptr_); + this->ptr_ = TAO::Objref_Traits<T>::nil (); } template <typename T> @@ -174,7 +174,7 @@ TAO_Objref_Out_T<T>::operator= ( const TAO_Objref_Var_T<T> & p ) { - this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.ptr ()); + this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.ptr ()); return *this; } diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index a158f2b2f35..f0d0fcf2407 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -37,11 +37,11 @@ namespace TAO template<typename T> struct Objref_Traits { - static T * tao_duplicate (T *); - static void tao_release (T *); - static T * tao_nil (void); - static CORBA::Boolean tao_marshal (T *, - TAO_OutputCDR &); + static T * duplicate (T *); + static void release (T *); + static T * nil (void); + static CORBA::Boolean marshal (T *, + TAO_OutputCDR &); }; } diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp index 6c1929201ed..8126af7647e 100644 --- a/TAO/tao/PICurrent.cpp +++ b/TAO/tao/PICurrent.cpp @@ -14,6 +14,7 @@ ACE_RCSID (tao, #include "ORB_Core.h" #include "TAO_Server_Request.h" #include "PICurrent_Copy_Callback.h" +#include "SystemException.h" TAO::PICurrent::PICurrent (TAO_ORB_Core * orb_core) @@ -120,7 +121,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id CORBA::Any (table[id]), // Make a copy. CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (any); @@ -134,7 +135,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId id CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (any); diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp index c4f5255cdd7..f86a18151eb 100644 --- a/TAO/tao/PICurrent_ORBInitializer.cpp +++ b/TAO/tao/PICurrent_ORBInitializer.cpp @@ -4,6 +4,7 @@ #include "ORB_Core.h" #include "ORBInitInfo.h" +#include "SystemException.h" ACE_RCSID (tao, PICurrent_ORBInitializer, @@ -26,7 +27,7 @@ TAO_PICurrent_ORBInitializer::pre_init ( TAO::PICurrent (orb_core), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index a50804aa762..addf34ef1fd 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -32,6 +32,7 @@ #include "PolicyC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" +#include "tao/SystemException.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" #include "tao/Typecode.h" @@ -456,7 +457,7 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Policy_ptr -TAO::Objref_Traits<CORBA::Policy>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Policy>::duplicate ( CORBA::Policy_ptr p ) { @@ -465,7 +466,7 @@ TAO::Objref_Traits<CORBA::Policy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Policy>::tao_release ( +TAO::Objref_Traits<CORBA::Policy>::release ( CORBA::Policy_ptr p ) { @@ -474,14 +475,14 @@ TAO::Objref_Traits<CORBA::Policy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Policy_ptr -TAO::Objref_Traits<CORBA::Policy>::tao_nil (void) +TAO::Objref_Traits<CORBA::Policy>::nil (void) { return CORBA::Policy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( +TAO::Objref_Traits<CORBA::Policy>::marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ) @@ -733,7 +734,7 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyManager_ptr -TAO::Objref_Traits<CORBA::PolicyManager>::tao_duplicate ( +TAO::Objref_Traits<CORBA::PolicyManager>::duplicate ( CORBA::PolicyManager_ptr p ) { @@ -742,7 +743,7 @@ TAO::Objref_Traits<CORBA::PolicyManager>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PolicyManager>::tao_release ( +TAO::Objref_Traits<CORBA::PolicyManager>::release ( CORBA::PolicyManager_ptr p ) { @@ -751,14 +752,14 @@ TAO::Objref_Traits<CORBA::PolicyManager>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyManager_ptr -TAO::Objref_Traits<CORBA::PolicyManager>::tao_nil (void) +TAO::Objref_Traits<CORBA::PolicyManager>::nil (void) { return CORBA::PolicyManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PolicyManager>::tao_marshal ( +TAO::Objref_Traits<CORBA::PolicyManager>::marshal ( CORBA::PolicyManager_ptr p, TAO_OutputCDR & cdr ) @@ -878,7 +879,7 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyCurrent_ptr -TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_duplicate ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::duplicate ( CORBA::PolicyCurrent_ptr p ) { @@ -887,7 +888,7 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_release ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::release ( CORBA::PolicyCurrent_ptr p ) { @@ -896,14 +897,14 @@ TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PolicyCurrent_ptr -TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_nil (void) +TAO::Objref_Traits<CORBA::PolicyCurrent>::nil (void) { return CORBA::PolicyCurrent::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_marshal ( +TAO::Objref_Traits<CORBA::PolicyCurrent>::marshal ( CORBA::PolicyCurrent_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 4ac4a42dd25..1d4c2b5815f 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -40,7 +40,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Environment.h" -#include "tao/Exception.h" +#include "tao/UserException.h" +#include "tao/SystemException.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -70,13 +71,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -86,62 +87,62 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::Short PolicyErrorCode; typedef CORBA::Short_out PolicyErrorCode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLICYERROR_CH_) #define _CORBA_POLICYERROR_CH_ - + class TAO_Export PolicyError : public CORBA::UserException { public: - + CORBA::PolicyErrorCode reason; PolicyError (void); PolicyError (const PolicyError &); ~PolicyError (void); PolicyError &operator= (const PolicyError &); - + static void _tao_any_destructor (void *); - + static PolicyError *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -153,51 +154,51 @@ namespace CORBA TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + PolicyError ( ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_INVALIDPOLICIES_CH_) #define _CORBA_INVALIDPOLICIES_CH_ - + class TAO_Export InvalidPolicies : public CORBA::UserException { public: - + CORBA::UShortSeq indices; InvalidPolicies (void); InvalidPolicies (const InvalidPolicies &); ~InvalidPolicies (void); InvalidPolicies &operator= (const InvalidPolicies &); - + static void _tao_any_destructor (void *); - + static InvalidPolicies *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -209,47 +210,47 @@ namespace CORBA TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + InvalidPolicies ( const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:125 - + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICY__VAR_OUT_CH_) #define _CORBA_POLICY__VAR_OUT_CH_ - + class Policy; typedef Policy *Policy_ptr; - + typedef TAO_Objref_Var_T< Policy > Policy_var; - + typedef TAO_Objref_Out_T< Policy @@ -257,13 +258,13 @@ namespace CORBA Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ - + class TAO_Export Policy : public virtual CORBA::Object { @@ -271,65 +272,65 @@ namespace CORBA friend class TAO::Narrow_Utils<Policy>; typedef Policy_ptr _ptr_type; typedef Policy_var _var_type; - + // The static operations. static Policy_ptr _duplicate (Policy_ptr obj); - + static Policy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Policy_ptr _nil (void) { return (Policy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -343,21 +344,21 @@ namespace CORBA private: TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; - + protected: // Concrete interface only. Policy (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Policy_setup_collocation (void); - + // Concrete non-local interface only. Policy ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Policy ( TAO_Stub *objref, @@ -365,38 +366,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Policy (void); - + private: // Private and unimplemented for concrete interfaces. Policy (const Policy &); - + void operator= (const Policy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_) #define _CORBA_POLICYMANAGER__VAR_OUT_CH_ - + class PolicyManager; typedef PolicyManager *PolicyManager_ptr; - + typedef TAO_Objref_Var_T< PolicyManager > PolicyManager_var; - + typedef TAO_Objref_Out_T< PolicyManager @@ -404,43 +405,43 @@ namespace CORBA PolicyManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ - + class TAO_Export PolicyManager : public virtual CORBA::Object { public: typedef PolicyManager_ptr _ptr_type; typedef PolicyManager_var _var_type; - + // The static operations. static PolicyManager_ptr _duplicate (PolicyManager_ptr obj); - + static PolicyManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyManager_ptr _nil (void) { return (PolicyManager_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -448,10 +449,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add @@ -461,53 +462,53 @@ namespace CORBA CORBA::SystemException , CORBA::InvalidPolicies )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. PolicyManager (void); - + virtual ~PolicyManager (void); - + private: // Private and unimplemented for concrete interfaces. PolicyManager (const PolicyManager &); - + void operator= (const PolicyManager &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_) #define _CORBA_POLICYCURRENT__VAR_OUT_CH_ - + class PolicyCurrent; typedef PolicyCurrent *PolicyCurrent_ptr; - + typedef TAO_Objref_Var_T< PolicyCurrent > PolicyCurrent_var; - + typedef TAO_Objref_Out_T< PolicyCurrent @@ -515,13 +516,13 @@ namespace CORBA PolicyCurrent_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ - + class TAO_Export PolicyCurrent : public virtual CORBA::PolicyManager, public virtual CORBA::Current @@ -529,56 +530,56 @@ namespace CORBA public: typedef PolicyCurrent_ptr _ptr_type; typedef PolicyCurrent_var _var_type; - + // The static operations. static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj); - + static PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PolicyCurrent_ptr _nil (void) { return (PolicyCurrent_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. PolicyCurrent (void); - + virtual ~PolicyCurrent (void); - + private: // Private and unimplemented for concrete interfaces. PolicyCurrent (const PolicyCurrent &); - + void operator= (const PolicyCurrent &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent; // TAO_IDL - Generated from @@ -606,18 +607,18 @@ namespace TAO #if !defined (_CORBA_POLICY__TRAITS_CH_) #define _CORBA_POLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Policy> { - static CORBA::Policy_ptr tao_duplicate ( + static CORBA::Policy_ptr duplicate ( CORBA::Policy_ptr ); - static void tao_release ( + static void release ( CORBA::Policy_ptr ); - static CORBA::Policy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Policy_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ); @@ -627,18 +628,18 @@ namespace TAO #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_) #define _CORBA_POLICYMANAGER__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PolicyManager> { - static CORBA::PolicyManager_ptr tao_duplicate ( + static CORBA::PolicyManager_ptr duplicate ( CORBA::PolicyManager_ptr ); - static void tao_release ( + static void release ( CORBA::PolicyManager_ptr ); - static CORBA::PolicyManager_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::PolicyManager_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::PolicyManager_ptr p, TAO_OutputCDR & cdr ); @@ -648,18 +649,18 @@ namespace TAO #if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_) #define _CORBA_POLICYCURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PolicyCurrent> { - static CORBA::PolicyCurrent_ptr tao_duplicate ( + static CORBA::PolicyCurrent_ptr duplicate ( CORBA::PolicyCurrent_ptr ); - static void tao_release ( + static void release ( CORBA::PolicyCurrent_ptr ); - static CORBA::PolicyCurrent_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::PolicyCurrent_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::PolicyCurrent_ptr p, TAO_OutputCDR & cdr ); @@ -741,4 +742,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp index a4c6e2259a0..2c15ef39c40 100644 --- a/TAO/tao/PolicyFactory_Registry.cpp +++ b/TAO/tao/PolicyFactory_Registry.cpp @@ -1,6 +1,7 @@ #include "PolicyFactory_Registry.h" #include "PortableInterceptorC.h" #include "ORB_Constants.h" +#include "SystemException.h" ACE_RCSID (tao, PolicyFactory_Registry, @@ -36,7 +37,7 @@ TAO_PolicyFactory_Registry::register_policy_factory ( { ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp index c6d45c86850..0a4aca61ee6 100644 --- a/TAO/tao/Policy_ForwardA.cpp +++ b/TAO/tao/Policy_ForwardA.cpp @@ -26,6 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "Policy_ForwardC.h" +#include "tao/SystemException.h" #include "tao/Typecode.h" #include "tao/Any_Dual_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -417,4 +418,3 @@ CORBA::Boolean operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 5b41eace926..11609fa1252 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -50,7 +50,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_POLICYLIST_CS_) @@ -106,7 +106,7 @@ void CORBA::PolicyList::_tao_any_destructor ( #endif /* end #if !defined */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_POLICYTYPESEQ_CS_) @@ -171,23 +171,23 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = - TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( + TAO::Objref_Traits<CORBA::Policy>::marshal ( _tao_sequence[i].in (), strm ); } - + return _tao_marshal_flag; } - + return 0; } @@ -197,7 +197,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -207,28 +207,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -246,13 +246,13 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + return 0; } @@ -262,7 +262,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -272,21 +272,21 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + } - + return 0; } @@ -305,12 +305,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (CORBA::SetOverrideType, _tao_temp); } - + return _tao_result; } @@ -443,5 +443,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum CORBA::PolicyType \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index ff979fc2b4d..516e4a032d9 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -73,33 +73,33 @@ namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::ULong PolicyType; typedef CORBA::ULong_out PolicyType_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_CORBA_POLICY__VAR_OUT_CH_) #define _CORBA_POLICY__VAR_OUT_CH_ - + class Policy; typedef Policy *Policy_ptr; - + typedef TAO_Objref_Var_T< Policy > Policy_var; - + typedef TAO_Objref_Out_T< Policy @@ -107,15 +107,15 @@ namespace CORBA Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_POLICYLIST_CH_) #define _CORBA_POLICYLIST_CH_ - + class PolicyList; - + typedef TAO_MngSeq_Var_T< PolicyList, @@ -125,7 +125,7 @@ namespace CORBA > > PolicyList_var; - + typedef TAO_MngSeq_Out_T< PolicyList, @@ -136,7 +136,7 @@ namespace CORBA > > PolicyList_out; - + class TAO_Export PolicyList : public TAO_Unbounded_Object_Sequence< @@ -150,39 +150,39 @@ namespace CORBA PolicyList ( CORBA::ULong max, CORBA::ULong length, - Policy_ptr* buffer, + Policy_ptr* buffer, CORBA::Boolean release = 0 ); PolicyList (const PolicyList &); ~PolicyList (void); - + static void _tao_any_destructor (void *); - + typedef PolicyList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_POLICYTYPESEQ_CH_) #define _CORBA_POLICYTYPESEQ_CH_ - + class PolicyTypeSeq; - + typedef TAO_FixedSeq_Var_T< PolicyTypeSeq, PolicyType > PolicyTypeSeq_var; - + typedef TAO_Seq_Out_T< PolicyTypeSeq, @@ -190,7 +190,7 @@ namespace CORBA PolicyType > PolicyTypeSeq_out; - + class TAO_Export PolicyTypeSeq : public TAO_Unbounded_Sequence< @@ -203,38 +203,38 @@ namespace CORBA PolicyTypeSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong* buffer, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); PolicyTypeSeq (const PolicyTypeSeq &); ~PolicyTypeSeq (void); - + static void _tao_any_destructor (void *); - + typedef PolicyTypeSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum SetOverrideType { SET_OVERRIDE, ADD_OVERRIDE }; - + typedef SetOverrideType &SetOverrideType_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType; // TAO_IDL - Generated from @@ -251,18 +251,18 @@ namespace TAO #if !defined (_CORBA_POLICY__TRAITS_CH_) #define _CORBA_POLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Policy> { - static CORBA::Policy_ptr tao_duplicate ( + static CORBA::Policy_ptr duplicate ( CORBA::Policy_ptr ); - static void tao_release ( + static void release ( CORBA::Policy_ptr ); - static CORBA::Policy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Policy_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Policy_ptr p, TAO_OutputCDR & cdr ); @@ -365,4 +365,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index 0881e7ea41b..518901ec37d 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -2,6 +2,7 @@ #include "Policy_Set.h" #include "Environment.h" +#include "SystemException.h" #include "debug.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 1269caa0d2a..acd5203ec22 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -30,6 +30,7 @@ #include "PollableC.h" +#include "tao/SystemException.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" @@ -57,7 +58,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr -TAO::Objref_Traits<CORBA::Pollable>::tao_duplicate ( +TAO::Objref_Traits<CORBA::Pollable>::duplicate ( CORBA::Pollable_ptr p ) { @@ -66,7 +67,7 @@ TAO::Objref_Traits<CORBA::Pollable>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::Pollable>::tao_release ( +TAO::Objref_Traits<CORBA::Pollable>::release ( CORBA::Pollable_ptr p ) { @@ -75,14 +76,14 @@ TAO::Objref_Traits<CORBA::Pollable>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Pollable_ptr -TAO::Objref_Traits<CORBA::Pollable>::tao_nil (void) +TAO::Objref_Traits<CORBA::Pollable>::nil (void) { return CORBA::Pollable::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::Pollable>::tao_marshal ( +TAO::Objref_Traits<CORBA::Pollable>::marshal ( CORBA::Pollable_ptr p, TAO_OutputCDR & cdr ) @@ -91,7 +92,7 @@ TAO::Objref_Traits<CORBA::Pollable>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Pollable_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -112,10 +113,10 @@ CORBA::Pollable::_narrow ( { return Pollable::_nil (); } - + Pollable_ptr proxy = dynamic_cast<Pollable_ptr> (_tao_objref); - + return Pollable::_duplicate (proxy); } @@ -129,10 +130,10 @@ CORBA::Pollable::_unchecked_narrow ( { return Pollable::_nil (); } - + Pollable_ptr proxy = dynamic_cast<Pollable_ptr> (_tao_objref); - + return Pollable::_duplicate (proxy); } @@ -143,7 +144,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -194,7 +195,7 @@ CORBA::Pollable::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr -TAO::Objref_Traits<CORBA::DIIPollable>::tao_duplicate ( +TAO::Objref_Traits<CORBA::DIIPollable>::duplicate ( CORBA::DIIPollable_ptr p ) { @@ -203,7 +204,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::DIIPollable>::tao_release ( +TAO::Objref_Traits<CORBA::DIIPollable>::release ( CORBA::DIIPollable_ptr p ) { @@ -212,14 +213,14 @@ TAO::Objref_Traits<CORBA::DIIPollable>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::DIIPollable_ptr -TAO::Objref_Traits<CORBA::DIIPollable>::tao_nil (void) +TAO::Objref_Traits<CORBA::DIIPollable>::nil (void) { return CORBA::DIIPollable::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::DIIPollable>::tao_marshal ( +TAO::Objref_Traits<CORBA::DIIPollable>::marshal ( CORBA::DIIPollable_ptr p, TAO_OutputCDR & cdr ) @@ -228,7 +229,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DIIPollable_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -249,10 +250,10 @@ CORBA::DIIPollable::_narrow ( { return DIIPollable::_nil (); } - + DIIPollable_ptr proxy = dynamic_cast<DIIPollable_ptr> (_tao_objref); - + return DIIPollable::_duplicate (proxy); } @@ -266,10 +267,10 @@ CORBA::DIIPollable::_unchecked_narrow ( { return DIIPollable::_nil (); } - + DIIPollable_ptr proxy = dynamic_cast<DIIPollable_ptr> (_tao_objref); - + return DIIPollable::_duplicate (proxy); } @@ -280,7 +281,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -335,7 +336,7 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr -TAO::Objref_Traits<CORBA::PollableSet>::tao_duplicate ( +TAO::Objref_Traits<CORBA::PollableSet>::duplicate ( CORBA::PollableSet_ptr p ) { @@ -344,7 +345,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<CORBA::PollableSet>::tao_release ( +TAO::Objref_Traits<CORBA::PollableSet>::release ( CORBA::PollableSet_ptr p ) { @@ -353,14 +354,14 @@ TAO::Objref_Traits<CORBA::PollableSet>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::PollableSet_ptr -TAO::Objref_Traits<CORBA::PollableSet>::tao_nil (void) +TAO::Objref_Traits<CORBA::PollableSet>::nil (void) { return CORBA::PollableSet::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<CORBA::PollableSet>::tao_marshal ( +TAO::Objref_Traits<CORBA::PollableSet>::marshal ( CORBA::PollableSet_ptr p, TAO_OutputCDR & cdr ) @@ -369,12 +370,12 @@ TAO::Objref_Traits<CORBA::PollableSet>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_PollableSet_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void) @@ -459,7 +460,7 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode ( -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::UnknownPollable::UnknownPollable (void) @@ -560,10 +561,10 @@ CORBA::PollableSet::_narrow ( { return PollableSet::_nil (); } - + PollableSet_ptr proxy = dynamic_cast<PollableSet_ptr> (_tao_objref); - + return PollableSet::_duplicate (proxy); } @@ -577,10 +578,10 @@ CORBA::PollableSet::_unchecked_narrow ( { return PollableSet::_nil (); } - + PollableSet_ptr proxy = dynamic_cast<PollableSet_ptr> (_tao_objref); - + return PollableSet::_duplicate (proxy); } @@ -591,7 +592,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -649,7 +650,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::PollableSet >; - + template class TAO_Objref_Out_T< CORBA::PollableSet @@ -664,7 +665,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::Pollable >; - + template class TAO_Objref_Out_T< CORBA::Pollable @@ -679,7 +680,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< CORBA::DIIPollable >; - + template class TAO_Objref_Out_T< CORBA::DIIPollable @@ -696,7 +697,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::PollableSet > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::PollableSet @@ -711,7 +712,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::Pollable > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::Pollable @@ -726,11 +727,10 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) TAO_Objref_Var_T< \ CORBA::DIIPollable > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DIIPollable > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 1b6f8da199a..4a91cd4336f 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -502,14 +502,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::PollableSet> { - static CORBA::PollableSet_ptr tao_duplicate ( + static CORBA::PollableSet_ptr duplicate ( CORBA::PollableSet_ptr ); - static void tao_release ( + static void release ( CORBA::PollableSet_ptr ); - static CORBA::PollableSet_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::PollableSet_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::PollableSet_ptr p, TAO_OutputCDR & cdr ); @@ -523,14 +523,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Pollable> { - static CORBA::Pollable_ptr tao_duplicate ( + static CORBA::Pollable_ptr duplicate ( CORBA::Pollable_ptr ); - static void tao_release ( + static void release ( CORBA::Pollable_ptr ); - static CORBA::Pollable_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::Pollable_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::Pollable_ptr p, TAO_OutputCDR & cdr ); @@ -544,14 +544,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::DIIPollable> { - static CORBA::DIIPollable_ptr tao_duplicate ( + static CORBA::DIIPollable_ptr duplicate ( CORBA::DIIPollable_ptr ); - static void tao_release ( + static void release ( CORBA::DIIPollable_ptr ); - static CORBA::DIIPollable_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static CORBA::DIIPollable_ptr nil (void); + static CORBA::Boolean marshal ( CORBA::DIIPollable_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 6a2fd23f1b9..bcd20a24149 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -32,6 +32,7 @@ #include "PortableInterceptorC.h" #include "tao/CDR.h" #include "tao/Typecode.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -58,7 +59,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr -TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::duplicate ( PortableInterceptor::Interceptor_ptr p ) { @@ -67,7 +68,7 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::release ( PortableInterceptor::Interceptor_ptr p ) { @@ -76,14 +77,14 @@ TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Interceptor_ptr -TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::Interceptor>::nil (void) { return PortableInterceptor::Interceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::Interceptor>::marshal ( PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ) @@ -581,7 +582,7 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr -TAO::Objref_Traits<PortableInterceptor::Current>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::Current>::duplicate ( PortableInterceptor::Current_ptr p ) { @@ -590,7 +591,7 @@ TAO::Objref_Traits<PortableInterceptor::Current>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::Current>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::Current>::release ( PortableInterceptor::Current_ptr p ) { @@ -599,14 +600,14 @@ TAO::Objref_Traits<PortableInterceptor::Current>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::Current_ptr -TAO::Objref_Traits<PortableInterceptor::Current>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::Current>::nil (void) { return PortableInterceptor::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::Current>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::Current>::marshal ( PortableInterceptor::Current_ptr p, TAO_OutputCDR & cdr ) @@ -730,7 +731,7 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::duplicate ( PortableInterceptor::RequestInfo_ptr p ) { @@ -739,7 +740,7 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::release ( PortableInterceptor::RequestInfo_ptr p ) { @@ -748,14 +749,14 @@ TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::RequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::nil (void) { return PortableInterceptor::RequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::marshal ( PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -875,7 +876,7 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::duplicate ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -884,7 +885,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::release ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -893,14 +894,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::nil (void) { return PortableInterceptor::ClientRequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::marshal ( PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -1024,7 +1025,7 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::duplicate ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -1033,7 +1034,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::release ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -1042,14 +1043,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::nil (void) { return PortableInterceptor::ServerRequestInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ) @@ -1173,7 +1174,7 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -1182,7 +1183,7 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_duplicate ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::release ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -1191,14 +1192,14 @@ TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ClientRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::nil (void) { return PortableInterceptor::ClientRequestInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -1322,7 +1323,7 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -1331,7 +1332,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_duplicate ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -1340,14 +1341,14 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) { return PortableInterceptor::ServerRequestInterceptor::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ) @@ -1482,7 +1483,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::duplicate ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -1491,7 +1492,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -1500,14 +1501,14 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) { return PortableInterceptor::PolicyFactory::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ) @@ -1627,7 +1628,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::duplicate ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -1636,7 +1637,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::release ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -1645,14 +1646,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitInfo_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void) { return PortableInterceptor::ORBInitInfo::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal ( PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ) @@ -2068,7 +2069,7 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_duplicate ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::duplicate ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -2077,7 +2078,7 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_release ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::release ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -2086,14 +2087,14 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableInterceptor::ORBInitializer_ptr -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_nil (void) +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::nil (void) { return PortableInterceptor::ORBInitializer::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_marshal ( +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::marshal ( PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 590aa228e06..a7f56cf7b42 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -99,29 +99,29 @@ namespace PortableInterceptor // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState HOLDING = 0; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState ACTIVE = 1; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState DISCARDING = 2; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState INACTIVE = 3; - + // TAO_IDL - Generated from // C:\ACE\develop\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState NON_EXISTENT = 4; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 @@ -2003,14 +2003,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Interceptor> { - static PortableInterceptor::Interceptor_ptr tao_duplicate ( + static PortableInterceptor::Interceptor_ptr duplicate ( PortableInterceptor::Interceptor_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::Interceptor_ptr ); - static PortableInterceptor::Interceptor_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::Interceptor_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::Interceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2024,14 +2024,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::Current> { - static PortableInterceptor::Current_ptr tao_duplicate ( + static PortableInterceptor::Current_ptr duplicate ( PortableInterceptor::Current_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::Current_ptr ); - static PortableInterceptor::Current_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::Current_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::Current_ptr p, TAO_OutputCDR & cdr ); @@ -2045,14 +2045,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::RequestInfo> { - static PortableInterceptor::RequestInfo_ptr tao_duplicate ( + static PortableInterceptor::RequestInfo_ptr duplicate ( PortableInterceptor::RequestInfo_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::RequestInfo_ptr ); - static PortableInterceptor::RequestInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::RequestInfo_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::RequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2066,14 +2066,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInfo> { - static PortableInterceptor::ClientRequestInfo_ptr tao_duplicate ( + static PortableInterceptor::ClientRequestInfo_ptr duplicate ( PortableInterceptor::ClientRequestInfo_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ClientRequestInfo_ptr ); - static PortableInterceptor::ClientRequestInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ClientRequestInfo_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ClientRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2087,14 +2087,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInfo> { - static PortableInterceptor::ServerRequestInfo_ptr tao_duplicate ( + static PortableInterceptor::ServerRequestInfo_ptr duplicate ( PortableInterceptor::ServerRequestInfo_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ServerRequestInfo_ptr ); - static PortableInterceptor::ServerRequestInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ServerRequestInfo_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2108,14 +2108,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ClientRequestInterceptor> { - static PortableInterceptor::ClientRequestInterceptor_ptr tao_duplicate ( + static PortableInterceptor::ClientRequestInterceptor_ptr duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ClientRequestInterceptor_ptr ); - static PortableInterceptor::ClientRequestInterceptor_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ClientRequestInterceptor_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2129,14 +2129,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ServerRequestInterceptor> { - static PortableInterceptor::ServerRequestInterceptor_ptr tao_duplicate ( + static PortableInterceptor::ServerRequestInterceptor_ptr duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ServerRequestInterceptor_ptr ); - static PortableInterceptor::ServerRequestInterceptor_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ServerRequestInterceptor_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr ); @@ -2150,14 +2150,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory> { - static PortableInterceptor::PolicyFactory_ptr tao_duplicate ( + static PortableInterceptor::PolicyFactory_ptr duplicate ( PortableInterceptor::PolicyFactory_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::PolicyFactory_ptr ); - static PortableInterceptor::PolicyFactory_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::PolicyFactory_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr ); @@ -2171,14 +2171,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitInfo> { - static PortableInterceptor::ORBInitInfo_ptr tao_duplicate ( + static PortableInterceptor::ORBInitInfo_ptr duplicate ( PortableInterceptor::ORBInitInfo_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ORBInitInfo_ptr ); - static PortableInterceptor::ORBInitInfo_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ORBInitInfo_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ORBInitInfo_ptr p, TAO_OutputCDR & cdr ); @@ -2192,14 +2192,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer> { - static PortableInterceptor::ORBInitializer_ptr tao_duplicate ( + static PortableInterceptor::ORBInitializer_ptr duplicate ( PortableInterceptor::ORBInitializer_ptr ); - static void tao_release ( + static void release ( PortableInterceptor::ORBInitializer_ptr ); - static PortableInterceptor::ORBInitializer_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableInterceptor::ORBInitializer_ptr nil (void); + static CORBA::Boolean marshal ( PortableInterceptor::ORBInitializer_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp index 1f3e1d90424..69eb28988f7 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp @@ -194,7 +194,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Locator_ptr -TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate ( +TAO::Objref_Traits<ImplementationRepository::Locator>::duplicate ( ImplementationRepository::Locator_ptr p ) { @@ -203,7 +203,7 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release ( +TAO::Objref_Traits<ImplementationRepository::Locator>::release ( ImplementationRepository::Locator_ptr p ) { @@ -212,14 +212,14 @@ TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Locator_ptr -TAO::Objref_Traits<ImplementationRepository::Locator>::tao_nil (void) +TAO::Objref_Traits<ImplementationRepository::Locator>::nil (void) { return ImplementationRepository::Locator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal ( +TAO::Objref_Traits<ImplementationRepository::Locator>::marshal ( ImplementationRepository::Locator_ptr p, TAO_OutputCDR & cdr ) @@ -1545,4 +1545,3 @@ CORBA::Boolean operator>> ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h index 5d4ca2afe6f..04204a62336 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.h +++ b/TAO/tao/PortableServer/ImR_LocatorC.h @@ -386,14 +386,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Locator> { - static ImplementationRepository::Locator_ptr tao_duplicate ( + static ImplementationRepository::Locator_ptr duplicate ( ImplementationRepository::Locator_ptr ); - static void tao_release ( + static void release ( ImplementationRepository::Locator_ptr ); - static ImplementationRepository::Locator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ImplementationRepository::Locator_ptr nil (void); + static CORBA::Boolean marshal ( ImplementationRepository::Locator_ptr p, TAO_OutputCDR & cdr ); @@ -458,4 +458,3 @@ TAO_PortableServer_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index c72fb8520cd..143506a5db1 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -160,7 +160,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerObject_ptr -TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate ( ImplementationRepository::ServerObject_ptr p ) { @@ -169,7 +169,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::release ( ImplementationRepository::ServerObject_ptr p ) { @@ -178,14 +178,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerObject_ptr -TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_nil (void) +TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void) { return ImplementationRepository::ServerObject::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal ( +TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal ( ImplementationRepository::ServerObject_ptr p, TAO_OutputCDR & cdr ) @@ -213,19 +213,19 @@ void ImplementationRepository::ServerObject::ping ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerObject_Proxy_Broker_ == 0) { ImplementationRepository_ServerObject_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -234,7 +234,7 @@ void ImplementationRepository::ServerObject::ping ( 4, this->the_TAO_ServerObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -253,19 +253,19 @@ void ImplementationRepository::ServerObject::shutdown ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerObject_Proxy_Broker_ == 0) { ImplementationRepository_ServerObject_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -274,7 +274,7 @@ void ImplementationRepository::ServerObject::shutdown ( 8, this->the_TAO_ServerObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -298,7 +298,7 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se ImplementationRepository::ServerObject::~ServerObject (void) {} -void +void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer) { ServerObject *_tao_tmp_pointer = @@ -343,7 +343,7 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -393,22 +393,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x7665724f), - ACE_NTOHL (0x626a6563), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x7665724f), + ACE_NTOHL (0x626a6563), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/ServerObject:1.0 13, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724f62), - ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65724f62), + ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = ServerObject }; @@ -426,7 +426,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_ServerObject; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void) @@ -509,7 +509,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -522,7 +522,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -539,24 +539,24 @@ static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416c72), - ACE_NTOHL (0x65616479), - ACE_NTOHL (0x52656769), - ACE_NTOHL (0x73746572), - ACE_NTOHL (0x65643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416c72), + ACE_NTOHL (0x65616479), + ACE_NTOHL (0x52656769), + ACE_NTOHL (0x73746572), + ACE_NTOHL (0x65643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/AlreadyRegistered:1.0 18, - ACE_NTOHL (0x416c7265), - ACE_NTOHL (0x61647952), - ACE_NTOHL (0x65676973), - ACE_NTOHL (0x74657265), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647952), + ACE_NTOHL (0x65676973), + ACE_NTOHL (0x74657265), ACE_NTOHL (0x64000000), // name = AlreadyRegistered 0, // member count }; @@ -575,7 +575,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::CannotActivate::CannotActivate (void) @@ -660,7 +660,7 @@ void ImplementationRepository::CannotActivate::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -673,7 +673,7 @@ void ImplementationRepository::CannotActivate::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -706,28 +706,28 @@ static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f43616e), - ACE_NTOHL (0x6e6f7441), - ACE_NTOHL (0x63746976), - ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f43616e), + ACE_NTOHL (0x6e6f7441), + ACE_NTOHL (0x63746976), + ACE_NTOHL (0x6174653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/CannotActivate:1.0 15, - ACE_NTOHL (0x43616e6e), - ACE_NTOHL (0x6f744163), - ACE_NTOHL (0x74697661), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744163), + ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000), // name = CannotActivate 1, // member count 7, - ACE_NTOHL (0x72656173), + ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -745,7 +745,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_CannotActivate; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 ImplementationRepository::NotFound::NotFound (void) @@ -828,7 +828,7 @@ void ImplementationRepository::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -841,7 +841,7 @@ void ImplementationRepository::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -858,20 +858,20 @@ static const CORBA::Long _oc_ImplementationRepository_NotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f4e6f74), - ACE_NTOHL (0x466f756e), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f4e6f74), + ACE_NTOHL (0x466f756e), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:ImplementationRepository/NotFound:1.0 9, - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0), // name = NotFound 0, // member count }; @@ -897,36 +897,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] = { TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -944,10 +944,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::EnvironmentVariable::_tao_any_destructor ( void *_tao_void_pointer ) @@ -964,21 +964,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -996,7 +996,7 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_Address; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) @@ -1056,23 +1056,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1081,36 +1081,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -1138,37 +1138,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START }; @@ -1193,56 +1193,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1251,95 +1251,95 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1357,10 +1357,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_StartupOptions; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::StartupOptions::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1377,95 +1377,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 584, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1474,120 +1474,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -1606,10 +1606,10 @@ namespace ImplementationRepository &_tc_TAO_tc_ImplementationRepository_ServerInformation; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void +void ImplementationRepository::ServerInformation::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1619,7 +1619,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) @@ -1679,26 +1679,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0 22, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e4c6973), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x74000000), // name = ServerInformationList CORBA::tk_sequence, // typecode kind 852, // encapsulation length @@ -1707,95 +1707,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 836, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformation:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000), // name = ServerInformation 4, // member count 15, - ACE_NTOHL (0x6c6f6769), - ACE_NTOHL (0x63616c5f), - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6c6f6769), + ACE_NTOHL (0x63616c5f), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, - ACE_NTOHL (0x73657276), + ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, - ACE_NTOHL (0x73746172), + ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind 584, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f537461), - ACE_NTOHL (0x72747570), - ACE_NTOHL (0x4f707469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f537461), + ACE_NTOHL (0x72747570), + ACE_NTOHL (0x4f707469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/StartupOptions:1.0 15, - ACE_NTOHL (0x53746172), - ACE_NTOHL (0x7475704f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53746172), + ACE_NTOHL (0x7475704f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 5, // member count 13, - ACE_NTOHL (0x636f6d6d), - ACE_NTOHL (0x616e645f), - ACE_NTOHL (0x6c696e65), + ACE_NTOHL (0x636f6d6d), + ACE_NTOHL (0x616e645f), + ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0), // name = command_line - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 12, - ACE_NTOHL (0x656e7669), - ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7669), + ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0 16, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e744c), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = EnvironmentList CORBA::tk_sequence, // typecode kind 148, // encapsulation length @@ -1804,120 +1804,120 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 132, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f456e76), - ACE_NTOHL (0x69726f6e), - ACE_NTOHL (0x6d656e74), - ACE_NTOHL (0x56617269), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f456e76), + ACE_NTOHL (0x69726f6e), + ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x56617269), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0 20, - ACE_NTOHL (0x456e7669), - ACE_NTOHL (0x726f6e6d), - ACE_NTOHL (0x656e7456), - ACE_NTOHL (0x61726961), + ACE_NTOHL (0x456e7669), + ACE_NTOHL (0x726f6e6d), + ACE_NTOHL (0x656e7456), + ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500), // name = EnvironmentVariable 2, // member count 5, - ACE_NTOHL (0x6e616d65), + ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, - ACE_NTOHL (0x76616c75), + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, 18, - ACE_NTOHL (0x776f726b), - ACE_NTOHL (0x696e675f), - ACE_NTOHL (0x64697265), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x776f726b), + ACE_NTOHL (0x696e675f), + ACE_NTOHL (0x64697265), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x76617469), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind 136, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416374), - ACE_NTOHL (0x69766174), - ACE_NTOHL (0x696f6e4d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416374), + ACE_NTOHL (0x69766174), + ACE_NTOHL (0x696f6e4d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/ActivationMode:1.0 15, - ACE_NTOHL (0x41637469), - ACE_NTOHL (0x76617469), - ACE_NTOHL (0x6f6e4d6f), + ACE_NTOHL (0x41637469), + ACE_NTOHL (0x76617469), + ACE_NTOHL (0x6f6e4d6f), ACE_NTOHL (0x64650000), // name = ActivationMode 4, // member count 7, - ACE_NTOHL (0x4e4f524d), + ACE_NTOHL (0x4e4f524d), ACE_NTOHL (0x414c0000), // name = NORMAL 7, - ACE_NTOHL (0x4d414e55), + ACE_NTOHL (0x4d414e55), ACE_NTOHL (0x414c0000), // name = MANUAL 11, - ACE_NTOHL (0x5045525f), - ACE_NTOHL (0x434c4945), + ACE_NTOHL (0x5045525f), + ACE_NTOHL (0x434c4945), ACE_NTOHL (0x4e540000), // name = PER_CLIENT 11, - ACE_NTOHL (0x4155544f), - ACE_NTOHL (0x5f535441), + ACE_NTOHL (0x4155544f), + ACE_NTOHL (0x5f535441), ACE_NTOHL (0x52540000), // name = AUTO_START - + 10, - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x7661746f), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x7661746f), ACE_NTOHL (0x72000000), // name = activator - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = location CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, - ACE_NTOHL (0x41646472), + ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -1946,7 +1946,7 @@ namespace ImplementationRepository ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Administration_ptr -TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate ( +TAO::Objref_Traits<ImplementationRepository::Administration>::duplicate ( ImplementationRepository::Administration_ptr p ) { @@ -1955,7 +1955,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release ( +TAO::Objref_Traits<ImplementationRepository::Administration>::release ( ImplementationRepository::Administration_ptr p ) { @@ -1964,14 +1964,14 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::Administration_ptr -TAO::Objref_Traits<ImplementationRepository::Administration>::tao_nil (void) +TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void) { return ImplementationRepository::Administration::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal ( +TAO::Objref_Traits<ImplementationRepository::Administration>::marshal ( ImplementationRepository::Administration_ptr p, TAO_OutputCDR & cdr ) @@ -1980,7 +1980,7 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2002,37 +2002,37 @@ void ImplementationRepository::Administration::activate_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound }, - + { "IDL:ImplementationRepository/CannotActivate:1.0", ImplementationRepository::CannotActivate::_alloc, ImplementationRepository::_tc_CannotActivate } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2041,7 +2041,7 @@ void ImplementationRepository::Administration::activate_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 @@ -2068,39 +2068,39 @@ char * ImplementationRepository::Administration::activate_server_with_startup ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_check_startup (check_startup); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_check_startup }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = + _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound }, - + { "IDL:ImplementationRepository/CannotActivate:1.0", ImplementationRepository::CannotActivate::_alloc, ImplementationRepository::_tc_CannotActivate } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2109,14 +2109,14 @@ char * ImplementationRepository::Administration::activate_server_with_startup ( 28, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2138,39 +2138,39 @@ void ImplementationRepository::Administration::register_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_options }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = { { "IDL:ImplementationRepository/AlreadyRegistered:1.0", ImplementationRepository::AlreadyRegistered::_alloc, ImplementationRepository::_tc_AlreadyRegistered }, - + { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2179,7 +2179,7 @@ void ImplementationRepository::Administration::register_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_register_server_exceptiondata, 2 @@ -2206,39 +2206,39 @@ void ImplementationRepository::Administration::reregister_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_options }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_reregister_server_exceptiondata [] = { { "IDL:ImplementationRepository/AlreadyRegistered:1.0", ImplementationRepository::AlreadyRegistered::_alloc, ImplementationRepository::_tc_AlreadyRegistered }, - + { "IDL:ImplementationRepository/NotFound:1.0", ImplementationRepository::NotFound::_alloc, ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2247,7 +2247,7 @@ void ImplementationRepository::Administration::reregister_server ( 17, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_reregister_server_exceptiondata, 2 @@ -2272,23 +2272,23 @@ void ImplementationRepository::Administration::remove_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2296,7 +2296,7 @@ void ImplementationRepository::Administration::remove_server ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2305,7 +2305,7 @@ void ImplementationRepository::Administration::remove_server ( 13, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 @@ -2330,23 +2330,23 @@ void ImplementationRepository::Administration::shutdown_server ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = + _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2354,7 +2354,7 @@ void ImplementationRepository::Administration::shutdown_server ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2363,7 +2363,7 @@ void ImplementationRepository::Administration::shutdown_server ( 15, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 @@ -2390,17 +2390,17 @@ void ImplementationRepository::Administration::server_is_running ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr); TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2408,9 +2408,9 @@ void ImplementationRepository::Administration::server_is_running ( &_tao_addr, &_tao_server_object }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = + _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2418,7 +2418,7 @@ void ImplementationRepository::Administration::server_is_running ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2427,7 +2427,7 @@ void ImplementationRepository::Administration::server_is_running ( 17, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 @@ -2452,23 +2452,23 @@ void ImplementationRepository::Administration::server_is_shutting_down ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = + _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2476,7 +2476,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2485,7 +2485,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( 23, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 @@ -2511,25 +2511,25 @@ void ImplementationRepository::Administration::find ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server); TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_server, &_tao_info }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_find_exceptiondata [] = + _tao_ImplementationRepository_Administration_find_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2537,7 +2537,7 @@ void ImplementationRepository::Administration::find ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2546,7 +2546,7 @@ void ImplementationRepository::Administration::find ( 4, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_find_exceptiondata, 1 @@ -2572,17 +2572,17 @@ void ImplementationRepository::Administration::list ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2590,7 +2590,7 @@ void ImplementationRepository::Administration::list ( &_tao_server_list, &_tao_server_iterator }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2599,7 +2599,7 @@ void ImplementationRepository::Administration::list ( 4, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2618,19 +2618,19 @@ void ImplementationRepository::Administration::shutdown_repo ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2639,7 +2639,7 @@ void ImplementationRepository::Administration::shutdown_repo ( 13, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2660,23 +2660,23 @@ char * ImplementationRepository::Administration::find_ior ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_Administration_Proxy_Broker_ == 0) { ImplementationRepository_Administration_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name (object_name); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_name }; - + static TAO::Exception_Data - _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = + _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2684,7 +2684,7 @@ char * ImplementationRepository::Administration::find_ior ( ImplementationRepository::_tc_NotFound } }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2693,14 +2693,14 @@ char * ImplementationRepository::Administration::find_ior ( 8, this->the_TAO_Administration_Proxy_Broker_ ); - + _tao_call.invoke ( _tao_ImplementationRepository_Administration_find_ior_exceptiondata, 1 ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2723,7 +2723,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio ImplementationRepository::Administration::~Administration (void) {} -void +void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer) { Administration *_tao_tmp_pointer = @@ -2768,7 +2768,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2818,22 +2818,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f41646d), - ACE_NTOHL (0x696e6973), - ACE_NTOHL (0x74726174), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f41646d), + ACE_NTOHL (0x696e6973), + ACE_NTOHL (0x74726174), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:ImplementationRepository/Administration:1.0 15, - ACE_NTOHL (0x41646d69), - ACE_NTOHL (0x6e697374), - ACE_NTOHL (0x72617469), + ACE_NTOHL (0x41646d69), + ACE_NTOHL (0x6e697374), + ACE_NTOHL (0x72617469), ACE_NTOHL (0x6f6e0000), // name = Administration }; @@ -2858,7 +2858,7 @@ namespace ImplementationRepository ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerInformationIterator_ptr -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_duplicate ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate ( ImplementationRepository::ServerInformationIterator_ptr p ) { @@ -2867,7 +2867,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_dup ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_release ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release ( ImplementationRepository::ServerInformationIterator_ptr p ) { @@ -2876,14 +2876,14 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_rel ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION ImplementationRepository::ServerInformationIterator_ptr -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_nil (void) +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void) { return ImplementationRepository::ServerInformationIterator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_marshal ( +TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal ( ImplementationRepository::ServerInformationIterator_ptr p, TAO_OutputCDR & cdr ) @@ -2892,7 +2892,7 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_mar } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2913,23 +2913,23 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0) { ImplementationRepository_ServerInformationIterator_setup_collocation (); } - + TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::ULong>::in_arg_val _tao_how_many (how_many); TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_how_many, &_tao_server_list }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2938,10 +2938,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( 6, this->the_TAO_ServerInformationIterator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2959,19 +2959,19 @@ void ImplementationRepository::ServerInformationIterator::destroy ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0) { ImplementationRepository_ServerInformationIterator_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2980,7 +2980,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( 7, this->the_TAO_ServerInformationIterator_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -3004,7 +3004,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void) {} -void +void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer) { ServerInformationIterator *_tao_tmp_pointer = @@ -3049,7 +3049,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati { obj->_add_ref (); } - + return obj; } @@ -3099,28 +3099,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[ { TAO_ENCAP_BYTE_ORDER, // byte order 59, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f536572), - ACE_NTOHL (0x76657249), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), - ACE_NTOHL (0x6f6e4974), - ACE_NTOHL (0x65726174), - ACE_NTOHL (0x6f723a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f536572), + ACE_NTOHL (0x76657249), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x6f6e4974), + ACE_NTOHL (0x65726174), + ACE_NTOHL (0x6f723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0 26, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6572496e), - ACE_NTOHL (0x666f726d), - ACE_NTOHL (0x6174696f), - ACE_NTOHL (0x6e497465), - ACE_NTOHL (0x7261746f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6572496e), + ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x6174696f), + ACE_NTOHL (0x6e497465), + ACE_NTOHL (0x7261746f), ACE_NTOHL (0x72000000), // name = ServerInformationIterator }; @@ -3193,7 +3193,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3203,12 +3203,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3219,7 +3219,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_val return 0; } ACE_ENDTRY; - + return 1; } @@ -3278,7 +3278,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3288,12 +3288,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3304,7 +3304,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value return 0; } ACE_ENDTRY; - + return 1; } @@ -3363,7 +3363,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION @@ -3373,12 +3373,12 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value ( ) { CORBA::String_var id; - + if ((cdr >> id.out ()) == 0) { return 0; } - + ACE_TRY_NEW_ENV { this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); @@ -3389,7 +3389,7 @@ TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value ( return 0; } ACE_ENDTRY; - + return 1; } @@ -3448,7 +3448,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3506,7 +3506,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -3588,11 +3588,11 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract ( _tao_any, ImplementationRepository::_tc_ActivationMode, - _tao_elem + _tao_elem ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3650,7 +3650,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3708,7 +3708,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // E:\doc_cvs\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -3894,21 +3894,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4048,20 +4048,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -4071,7 +4071,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -4081,28 +4081,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -4121,12 +4121,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = static_cast<ImplementationRepository::ActivationMode> (_tao_temp); } - + return _tao_result; } @@ -4198,20 +4198,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } @@ -4221,7 +4221,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -4231,28 +4231,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return 0; } @@ -4276,21 +4276,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4312,21 +4312,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4362,7 +4362,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::ServerObject >; - + template class TAO_Objref_Out_T< ImplementationRepository::ServerObject @@ -4604,7 +4604,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::ServerInformationIterator >; - + template class TAO_Objref_Out_T< ImplementationRepository::ServerInformationIterator @@ -4651,7 +4651,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< ImplementationRepository::Administration >; - + template class TAO_Objref_Out_T< ImplementationRepository::Administration @@ -4696,7 +4696,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::ServerObject > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::ServerObject @@ -4938,7 +4938,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::ServerInformationIterator > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::ServerInformationIterator @@ -4985,7 +4985,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ ImplementationRepository::Administration > - + # pragma instantiate \ TAO_Objref_Out_T< \ ImplementationRepository::Administration @@ -5001,5 +5001,4 @@ CORBA::Boolean operator>> ( ImplementationRepository::Administration \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index b25e3bdcaa9..2342c7593e7 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -1048,14 +1048,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerObject> { - static ImplementationRepository::ServerObject_ptr tao_duplicate ( + static ImplementationRepository::ServerObject_ptr duplicate ( ImplementationRepository::ServerObject_ptr ); - static void tao_release ( + static void release ( ImplementationRepository::ServerObject_ptr ); - static ImplementationRepository::ServerObject_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ImplementationRepository::ServerObject_ptr nil (void); + static CORBA::Boolean marshal ( ImplementationRepository::ServerObject_ptr p, TAO_OutputCDR & cdr ); @@ -1069,14 +1069,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::ServerInformationIterator> { - static ImplementationRepository::ServerInformationIterator_ptr tao_duplicate ( + static ImplementationRepository::ServerInformationIterator_ptr duplicate ( ImplementationRepository::ServerInformationIterator_ptr ); - static void tao_release ( + static void release ( ImplementationRepository::ServerInformationIterator_ptr ); - static ImplementationRepository::ServerInformationIterator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ImplementationRepository::ServerInformationIterator_ptr nil (void); + static CORBA::Boolean marshal ( ImplementationRepository::ServerInformationIterator_ptr p, TAO_OutputCDR & cdr ); @@ -1090,14 +1090,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<ImplementationRepository::Administration> { - static ImplementationRepository::Administration_ptr tao_duplicate ( + static ImplementationRepository::Administration_ptr duplicate ( ImplementationRepository::Administration_ptr ); - static void tao_release ( + static void release ( ImplementationRepository::Administration_ptr ); - static ImplementationRepository::Administration_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static ImplementationRepository::Administration_ptr nil (void); + static CORBA::Boolean marshal ( ImplementationRepository::Administration_ptr p, TAO_OutputCDR & cdr ); @@ -1309,4 +1309,3 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i index d1cb1630b7f..e51bd87f527 100644 --- a/TAO/tao/PortableServer/Object_Adapter.i +++ b/TAO/tao/PortableServer/Object_Adapter.i @@ -1,5 +1,9 @@ +// -*- C++ -*- +// // $Id$ +#include "tao/SystemException.h" + ACE_INLINE TAO_POA_Current::TAO_POA_Current (void) diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index b97eddf2681..d60d3dd08f7 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -3,6 +3,8 @@ // $Id$ #include "tao/Environment.h" +#include "tao/SystemException.h" + ACE_INLINE ACE_Lock & TAO_POA_Manager::lock (void) diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index b7eef211bed..f9e777c153b 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -466,7 +466,7 @@ void PortableServer::IDs::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr -TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate ( PortableServer::ThreadPolicy_ptr p ) { @@ -475,7 +475,7 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::release ( PortableServer::ThreadPolicy_ptr p ) { @@ -484,14 +484,14 @@ TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ThreadPolicy_ptr -TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void) { return PortableServer::ThreadPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal ( PortableServer::ThreadPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -617,7 +617,7 @@ PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr -TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate ( PortableServer::LifespanPolicy_ptr p ) { @@ -626,7 +626,7 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::release ( PortableServer::LifespanPolicy_ptr p ) { @@ -635,14 +635,14 @@ TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::LifespanPolicy_ptr -TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void) { return PortableServer::LifespanPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal ( PortableServer::LifespanPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -766,7 +766,7 @@ PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate ( PortableServer::IdUniquenessPolicy_ptr p ) { @@ -775,7 +775,7 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release ( PortableServer::IdUniquenessPolicy_ptr p ) { @@ -784,14 +784,14 @@ TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdUniquenessPolicy_ptr -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void) { return PortableServer::IdUniquenessPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal ( PortableServer::IdUniquenessPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -915,7 +915,7 @@ PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate ( PortableServer::IdAssignmentPolicy_ptr p ) { @@ -924,7 +924,7 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release ( PortableServer::IdAssignmentPolicy_ptr p ) { @@ -933,14 +933,14 @@ TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::IdAssignmentPolicy_ptr -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void) { return PortableServer::IdAssignmentPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal ( PortableServer::IdAssignmentPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1066,7 +1066,7 @@ PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate ( PortableServer::ImplicitActivationPolicy_ptr p ) { @@ -1075,7 +1075,7 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release ( PortableServer::ImplicitActivationPolicy_ptr p ) { @@ -1084,14 +1084,14 @@ TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ImplicitActivationPolicy_ptr -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void) { return PortableServer::ImplicitActivationPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal ( PortableServer::ImplicitActivationPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1219,7 +1219,7 @@ PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate ( PortableServer::ServantRetentionPolicy_ptr p ) { @@ -1228,7 +1228,7 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release ( PortableServer::ServantRetentionPolicy_ptr p ) { @@ -1237,14 +1237,14 @@ TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantRetentionPolicy_ptr -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void) { return PortableServer::ServantRetentionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal ( PortableServer::ServantRetentionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1372,7 +1372,7 @@ PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate ( PortableServer::RequestProcessingPolicy_ptr p ) { @@ -1381,7 +1381,7 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release ( PortableServer::RequestProcessingPolicy_ptr p ) { @@ -1390,14 +1390,14 @@ TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::RequestProcessingPolicy_ptr -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_nil (void) +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void) { return PortableServer::RequestProcessingPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal ( +TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal ( PortableServer::RequestProcessingPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1523,7 +1523,7 @@ PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr -TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::POAManager>::duplicate ( PortableServer::POAManager_ptr p ) { @@ -1532,7 +1532,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::POAManager>::tao_release ( +TAO::Objref_Traits<PortableServer::POAManager>::release ( PortableServer::POAManager_ptr p ) { @@ -1541,14 +1541,14 @@ TAO::Objref_Traits<PortableServer::POAManager>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POAManager_ptr -TAO::Objref_Traits<PortableServer::POAManager>::tao_nil (void) +TAO::Objref_Traits<PortableServer::POAManager>::nil (void) { return PortableServer::POAManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal ( +TAO::Objref_Traits<PortableServer::POAManager>::marshal ( PortableServer::POAManager_ptr p, TAO_OutputCDR & cdr ) @@ -1771,7 +1771,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr -TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate ( PortableServer::AdapterActivator_ptr p ) { @@ -1780,7 +1780,7 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::release ( PortableServer::AdapterActivator_ptr p ) { @@ -1789,14 +1789,14 @@ TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::AdapterActivator_ptr -TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_nil (void) +TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void) { return PortableServer::AdapterActivator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal ( +TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal ( PortableServer::AdapterActivator_ptr p, TAO_OutputCDR & cdr ) @@ -1916,7 +1916,7 @@ PortableServer::AdapterActivator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr -TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ServantManager>::duplicate ( PortableServer::ServantManager_ptr p ) { @@ -1925,7 +1925,7 @@ TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantManager>::tao_release ( +TAO::Objref_Traits<PortableServer::ServantManager>::release ( PortableServer::ServantManager_ptr p ) { @@ -1934,14 +1934,14 @@ TAO::Objref_Traits<PortableServer::ServantManager>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantManager_ptr -TAO::Objref_Traits<PortableServer::ServantManager>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ServantManager>::nil (void) { return PortableServer::ServantManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ServantManager>::marshal ( PortableServer::ServantManager_ptr p, TAO_OutputCDR & cdr ) @@ -2061,7 +2061,7 @@ PortableServer::ServantManager::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr -TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate ( PortableServer::ServantActivator_ptr p ) { @@ -2070,7 +2070,7 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release ( +TAO::Objref_Traits<PortableServer::ServantActivator>::release ( PortableServer::ServantActivator_ptr p ) { @@ -2079,14 +2079,14 @@ TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantActivator_ptr -TAO::Objref_Traits<PortableServer::ServantActivator>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void) { return PortableServer::ServantActivator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ServantActivator>::marshal ( PortableServer::ServantActivator_ptr p, TAO_OutputCDR & cdr ) @@ -2210,7 +2210,7 @@ PortableServer::ServantActivator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr -TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate ( PortableServer::ServantLocator_ptr p ) { @@ -2219,7 +2219,7 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release ( +TAO::Objref_Traits<PortableServer::ServantLocator>::release ( PortableServer::ServantLocator_ptr p ) { @@ -2228,14 +2228,14 @@ TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::ServantLocator_ptr -TAO::Objref_Traits<PortableServer::ServantLocator>::tao_nil (void) +TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void) { return PortableServer::ServantLocator::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal ( +TAO::Objref_Traits<PortableServer::ServantLocator>::marshal ( PortableServer::ServantLocator_ptr p, TAO_OutputCDR & cdr ) @@ -2361,7 +2361,7 @@ PortableServer::ServantLocator::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::POA>::duplicate ( PortableServer::POA_ptr p ) { @@ -2370,7 +2370,7 @@ TAO::Objref_Traits<PortableServer::POA>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::POA>::tao_release ( +TAO::Objref_Traits<PortableServer::POA>::release ( PortableServer::POA_ptr p ) { @@ -2379,14 +2379,14 @@ TAO::Objref_Traits<PortableServer::POA>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::POA_ptr -TAO::Objref_Traits<PortableServer::POA>::tao_nil (void) +TAO::Objref_Traits<PortableServer::POA>::nil (void) { return PortableServer::POA::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::POA>::tao_marshal ( +TAO::Objref_Traits<PortableServer::POA>::marshal ( PortableServer::POA_ptr p, TAO_OutputCDR & cdr ) @@ -3538,7 +3538,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &) ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr -TAO::Objref_Traits<PortableServer::Current>::tao_duplicate ( +TAO::Objref_Traits<PortableServer::Current>::duplicate ( PortableServer::Current_ptr p ) { @@ -3547,7 +3547,7 @@ TAO::Objref_Traits<PortableServer::Current>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<PortableServer::Current>::tao_release ( +TAO::Objref_Traits<PortableServer::Current>::release ( PortableServer::Current_ptr p ) { @@ -3556,14 +3556,14 @@ TAO::Objref_Traits<PortableServer::Current>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION PortableServer::Current_ptr -TAO::Objref_Traits<PortableServer::Current>::tao_nil (void) +TAO::Objref_Traits<PortableServer::Current>::nil (void) { return PortableServer::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<PortableServer::Current>::tao_marshal ( +TAO::Objref_Traits<PortableServer::Current>::marshal ( PortableServer::Current_ptr p, TAO_OutputCDR & cdr ) @@ -4767,4 +4767,3 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 0751314e5b6..4d3f66bc31b 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -3206,14 +3206,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::POA> { - static PortableServer::POA_ptr tao_duplicate ( + static PortableServer::POA_ptr duplicate ( PortableServer::POA_ptr ); - static void tao_release ( + static void release ( PortableServer::POA_ptr ); - static PortableServer::POA_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::POA_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::POA_ptr p, TAO_OutputCDR & cdr ); @@ -3229,14 +3229,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ThreadPolicy> { - static PortableServer::ThreadPolicy_ptr tao_duplicate ( + static PortableServer::ThreadPolicy_ptr duplicate ( PortableServer::ThreadPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::ThreadPolicy_ptr ); - static PortableServer::ThreadPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ThreadPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ThreadPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3252,14 +3252,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::LifespanPolicy> { - static PortableServer::LifespanPolicy_ptr tao_duplicate ( + static PortableServer::LifespanPolicy_ptr duplicate ( PortableServer::LifespanPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::LifespanPolicy_ptr ); - static PortableServer::LifespanPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::LifespanPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::LifespanPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3273,14 +3273,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdUniquenessPolicy> { - static PortableServer::IdUniquenessPolicy_ptr tao_duplicate ( + static PortableServer::IdUniquenessPolicy_ptr duplicate ( PortableServer::IdUniquenessPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::IdUniquenessPolicy_ptr ); - static PortableServer::IdUniquenessPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::IdUniquenessPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::IdUniquenessPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3294,14 +3294,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdAssignmentPolicy> { - static PortableServer::IdAssignmentPolicy_ptr tao_duplicate ( + static PortableServer::IdAssignmentPolicy_ptr duplicate ( PortableServer::IdAssignmentPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::IdAssignmentPolicy_ptr ); - static PortableServer::IdAssignmentPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::IdAssignmentPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::IdAssignmentPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3317,14 +3317,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ImplicitActivationPolicy> { - static PortableServer::ImplicitActivationPolicy_ptr tao_duplicate ( + static PortableServer::ImplicitActivationPolicy_ptr duplicate ( PortableServer::ImplicitActivationPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::ImplicitActivationPolicy_ptr ); - static PortableServer::ImplicitActivationPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ImplicitActivationPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ImplicitActivationPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3338,14 +3338,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantRetentionPolicy> { - static PortableServer::ServantRetentionPolicy_ptr tao_duplicate ( + static PortableServer::ServantRetentionPolicy_ptr duplicate ( PortableServer::ServantRetentionPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::ServantRetentionPolicy_ptr ); - static PortableServer::ServantRetentionPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ServantRetentionPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ServantRetentionPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3359,14 +3359,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::RequestProcessingPolicy> { - static PortableServer::RequestProcessingPolicy_ptr tao_duplicate ( + static PortableServer::RequestProcessingPolicy_ptr duplicate ( PortableServer::RequestProcessingPolicy_ptr ); - static void tao_release ( + static void release ( PortableServer::RequestProcessingPolicy_ptr ); - static PortableServer::RequestProcessingPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::RequestProcessingPolicy_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::RequestProcessingPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -3382,14 +3382,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager> { - static PortableServer::POAManager_ptr tao_duplicate ( + static PortableServer::POAManager_ptr duplicate ( PortableServer::POAManager_ptr ); - static void tao_release ( + static void release ( PortableServer::POAManager_ptr ); - static PortableServer::POAManager_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::POAManager_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::POAManager_ptr p, TAO_OutputCDR & cdr ); @@ -3405,14 +3405,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::AdapterActivator> { - static PortableServer::AdapterActivator_ptr tao_duplicate ( + static PortableServer::AdapterActivator_ptr duplicate ( PortableServer::AdapterActivator_ptr ); - static void tao_release ( + static void release ( PortableServer::AdapterActivator_ptr ); - static PortableServer::AdapterActivator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::AdapterActivator_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::AdapterActivator_ptr p, TAO_OutputCDR & cdr ); @@ -3426,14 +3426,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantManager> { - static PortableServer::ServantManager_ptr tao_duplicate ( + static PortableServer::ServantManager_ptr duplicate ( PortableServer::ServantManager_ptr ); - static void tao_release ( + static void release ( PortableServer::ServantManager_ptr ); - static PortableServer::ServantManager_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ServantManager_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ServantManager_ptr p, TAO_OutputCDR & cdr ); @@ -3447,14 +3447,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantActivator> { - static PortableServer::ServantActivator_ptr tao_duplicate ( + static PortableServer::ServantActivator_ptr duplicate ( PortableServer::ServantActivator_ptr ); - static void tao_release ( + static void release ( PortableServer::ServantActivator_ptr ); - static PortableServer::ServantActivator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ServantActivator_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ServantActivator_ptr p, TAO_OutputCDR & cdr ); @@ -3468,14 +3468,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantLocator> { - static PortableServer::ServantLocator_ptr tao_duplicate ( + static PortableServer::ServantLocator_ptr duplicate ( PortableServer::ServantLocator_ptr ); - static void tao_release ( + static void release ( PortableServer::ServantLocator_ptr ); - static PortableServer::ServantLocator_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::ServantLocator_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::ServantLocator_ptr p, TAO_OutputCDR & cdr ); @@ -3491,14 +3491,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_PortableServer_Export Objref_Traits<PortableServer::Current> { - static PortableServer::Current_ptr tao_duplicate ( + static PortableServer::Current_ptr duplicate ( PortableServer::Current_ptr ); - static void tao_release ( + static void release ( PortableServer::Current_ptr ); - static PortableServer::Current_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static PortableServer::Current_ptr nil (void); + static CORBA::Boolean marshal ( PortableServer::Current_ptr p, TAO_OutputCDR & cdr ); @@ -3906,4 +3906,3 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index ac369ee1acf..e0e87d07e48 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -8,6 +8,7 @@ #include "tao/ORB_Core.h" #include "tao/Client_Strategy_Factory.h" #include "tao/CDR.h" +#include "tao/SystemException.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" @@ -592,7 +593,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) // updated. ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -623,7 +624,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) // updated. ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -658,7 +659,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr default: ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -672,7 +673,7 @@ TAO_Profile::parse_string (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -704,7 +705,7 @@ TAO_Profile::parse_string (const char *ior { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 0b43f2b87a3..42a79a32eb5 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -11,6 +11,7 @@ #include "Connector_Registry.h" #include "Transport_Connector.h" #include "Endpoint.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "Profile_Transport_Resolver.inl" @@ -97,7 +98,7 @@ namespace TAO { ACE_THROW (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO)); } @@ -127,7 +128,7 @@ namespace TAO { ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), false); @@ -207,7 +208,7 @@ namespace TAO CORBA::PolicyList (0), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 72a30a6952d..2dadf94bb98 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -23,7 +23,7 @@ #include "ace/CORBA_macros.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_Stub; class TAO_Profile; @@ -34,7 +34,6 @@ class TAO_Transport_Descriptor_Interface; namespace CORBA { - class SystemException; class Environment; class Object; class PolicyList; diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index b6cec146889..78f244e4bcf 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -537,7 +537,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::duplicate ( RTCORBA::PriorityModelPolicy_ptr p ) { @@ -546,7 +546,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( RTCORBA::PriorityModelPolicy_ptr p ) { @@ -555,14 +555,14 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityModelPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::nil (void) { return RTCORBA::PriorityModelPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal ( RTCORBA::PriorityModelPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -726,7 +726,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::duplicate ( RTCORBA::ThreadpoolPolicy_ptr p ) { @@ -735,7 +735,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( RTCORBA::ThreadpoolPolicy_ptr p ) { @@ -744,14 +744,14 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ThreadpoolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::nil (void) { return RTCORBA::ThreadpoolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal ( RTCORBA::ThreadpoolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -915,7 +915,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::duplicate ( RTCORBA::ProtocolProperties_ptr p ) { @@ -924,7 +924,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_release ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( RTCORBA::ProtocolProperties_ptr p ) { @@ -933,14 +933,14 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::nil (void) { return RTCORBA::ProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ProtocolProperties>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal ( RTCORBA::ProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -1433,7 +1433,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::duplicate ( RTCORBA::ServerProtocolPolicy_ptr p ) { @@ -1442,7 +1442,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( RTCORBA::ServerProtocolPolicy_ptr p ) { @@ -1451,14 +1451,14 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ServerProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::nil (void) { return RTCORBA::ServerProtocolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal ( RTCORBA::ServerProtocolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1624,7 +1624,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::duplicate ( RTCORBA::ClientProtocolPolicy_ptr p ) { @@ -1633,7 +1633,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( RTCORBA::ClientProtocolPolicy_ptr p ) { @@ -1642,14 +1642,14 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::ClientProtocolPolicy_ptr -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::nil (void) { return RTCORBA::ClientProtocolPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal ( RTCORBA::ClientProtocolPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -1815,7 +1815,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::duplicate ( RTCORBA::PrivateConnectionPolicy_ptr p ) { @@ -1824,7 +1824,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( RTCORBA::PrivateConnectionPolicy_ptr p ) { @@ -1833,14 +1833,14 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PrivateConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::nil (void) { return RTCORBA::PrivateConnectionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal ( RTCORBA::PrivateConnectionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -2006,7 +2006,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::duplicate ( RTCORBA::TCPProtocolProperties_ptr p ) { @@ -2015,7 +2015,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_release ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( RTCORBA::TCPProtocolProperties_ptr p ) { @@ -2024,14 +2024,14 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::TCPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::nil (void) { return RTCORBA::TCPProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal ( RTCORBA::TCPProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2197,7 +2197,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::duplicate ( RTCORBA::GIOPProtocolProperties_ptr p ) { @@ -2206,7 +2206,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_release ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( RTCORBA::GIOPProtocolProperties_ptr p ) { @@ -2215,14 +2215,14 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::GIOPProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::nil (void) { return RTCORBA::GIOPProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal ( RTCORBA::GIOPProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2388,7 +2388,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::duplicate ( RTCORBA::UnixDomainProtocolProperties_ptr p ) { @@ -2397,7 +2397,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_release ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( RTCORBA::UnixDomainProtocolProperties_ptr p ) { @@ -2406,14 +2406,14 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::UnixDomainProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::nil (void) { return RTCORBA::UnixDomainProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal ( RTCORBA::UnixDomainProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -2583,7 +2583,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::duplicate ( RTCORBA::SharedMemoryProtocolProperties_ptr p ) { @@ -2592,7 +2592,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_release ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( RTCORBA::SharedMemoryProtocolProperties_ptr p ) { @@ -2601,14 +2601,14 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::SharedMemoryProtocolProperties_ptr -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::nil (void) { return RTCORBA::SharedMemoryProtocolProperties::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal ( RTCORBA::SharedMemoryProtocolProperties_ptr p, TAO_OutputCDR & cdr ) @@ -3037,7 +3037,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::duplicate ( RTCORBA::PriorityBandedConnectionPolicy_ptr p ) { @@ -3046,7 +3046,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_release ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( RTCORBA::PriorityBandedConnectionPolicy_ptr p ) { @@ -3055,14 +3055,14 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::PriorityBandedConnectionPolicy_ptr -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::nil (void) { return RTCORBA::PriorityBandedConnectionPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal ( RTCORBA::PriorityBandedConnectionPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -3232,7 +3232,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr -TAO::Objref_Traits<RTCORBA::Current>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::Current>::duplicate ( RTCORBA::Current_ptr p ) { @@ -3241,7 +3241,7 @@ TAO::Objref_Traits<RTCORBA::Current>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::Current>::tao_release ( +TAO::Objref_Traits<RTCORBA::Current>::release ( RTCORBA::Current_ptr p ) { @@ -3250,14 +3250,14 @@ TAO::Objref_Traits<RTCORBA::Current>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Current_ptr -TAO::Objref_Traits<RTCORBA::Current>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::Current>::nil (void) { return RTCORBA::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::Current>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::Current>::marshal ( RTCORBA::Current_ptr p, TAO_OutputCDR & cdr ) @@ -3415,7 +3415,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr -TAO::Objref_Traits<RTCORBA::Mutex>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::Mutex>::duplicate ( RTCORBA::Mutex_ptr p ) { @@ -3424,7 +3424,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::Mutex>::tao_release ( +TAO::Objref_Traits<RTCORBA::Mutex>::release ( RTCORBA::Mutex_ptr p ) { @@ -3433,14 +3433,14 @@ TAO::Objref_Traits<RTCORBA::Mutex>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::Mutex_ptr -TAO::Objref_Traits<RTCORBA::Mutex>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::Mutex>::nil (void) { return RTCORBA::Mutex::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::Mutex>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::Mutex>::marshal ( RTCORBA::Mutex_ptr p, TAO_OutputCDR & cdr ) @@ -3594,7 +3594,7 @@ namespace RTCORBA ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr -TAO::Objref_Traits<RTCORBA::RTORB>::tao_duplicate ( +TAO::Objref_Traits<RTCORBA::RTORB>::duplicate ( RTCORBA::RTORB_ptr p ) { @@ -3603,7 +3603,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTCORBA::RTORB>::tao_release ( +TAO::Objref_Traits<RTCORBA::RTORB>::release ( RTCORBA::RTORB_ptr p ) { @@ -3612,14 +3612,14 @@ TAO::Objref_Traits<RTCORBA::RTORB>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTCORBA::RTORB_ptr -TAO::Objref_Traits<RTCORBA::RTORB>::tao_nil (void) +TAO::Objref_Traits<RTCORBA::RTORB>::nil (void) { return RTCORBA::RTORB::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTCORBA::RTORB>::tao_marshal ( +TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( RTCORBA::RTORB_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 0b618c573a2..b5fffae55be 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -2426,14 +2426,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityModelPolicy> { - static RTCORBA::PriorityModelPolicy_ptr tao_duplicate ( + static RTCORBA::PriorityModelPolicy_ptr duplicate ( RTCORBA::PriorityModelPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::PriorityModelPolicy_ptr ); - static RTCORBA::PriorityModelPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::PriorityModelPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::PriorityModelPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2447,14 +2447,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ThreadpoolPolicy> { - static RTCORBA::ThreadpoolPolicy_ptr tao_duplicate ( + static RTCORBA::ThreadpoolPolicy_ptr duplicate ( RTCORBA::ThreadpoolPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::ThreadpoolPolicy_ptr ); - static RTCORBA::ThreadpoolPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::ThreadpoolPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::ThreadpoolPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2468,14 +2468,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ProtocolProperties> { - static RTCORBA::ProtocolProperties_ptr tao_duplicate ( + static RTCORBA::ProtocolProperties_ptr duplicate ( RTCORBA::ProtocolProperties_ptr ); - static void tao_release ( + static void release ( RTCORBA::ProtocolProperties_ptr ); - static RTCORBA::ProtocolProperties_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::ProtocolProperties_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::ProtocolProperties_ptr p, TAO_OutputCDR & cdr ); @@ -2489,14 +2489,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ServerProtocolPolicy> { - static RTCORBA::ServerProtocolPolicy_ptr tao_duplicate ( + static RTCORBA::ServerProtocolPolicy_ptr duplicate ( RTCORBA::ServerProtocolPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::ServerProtocolPolicy_ptr ); - static RTCORBA::ServerProtocolPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::ServerProtocolPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::ServerProtocolPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2510,14 +2510,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::ClientProtocolPolicy> { - static RTCORBA::ClientProtocolPolicy_ptr tao_duplicate ( + static RTCORBA::ClientProtocolPolicy_ptr duplicate ( RTCORBA::ClientProtocolPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::ClientProtocolPolicy_ptr ); - static RTCORBA::ClientProtocolPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::ClientProtocolPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::ClientProtocolPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2531,14 +2531,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PrivateConnectionPolicy> { - static RTCORBA::PrivateConnectionPolicy_ptr tao_duplicate ( + static RTCORBA::PrivateConnectionPolicy_ptr duplicate ( RTCORBA::PrivateConnectionPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::PrivateConnectionPolicy_ptr ); - static RTCORBA::PrivateConnectionPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::PrivateConnectionPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::PrivateConnectionPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2552,14 +2552,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::TCPProtocolProperties> { - static RTCORBA::TCPProtocolProperties_ptr tao_duplicate ( + static RTCORBA::TCPProtocolProperties_ptr duplicate ( RTCORBA::TCPProtocolProperties_ptr ); - static void tao_release ( + static void release ( RTCORBA::TCPProtocolProperties_ptr ); - static RTCORBA::TCPProtocolProperties_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::TCPProtocolProperties_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::TCPProtocolProperties_ptr p, TAO_OutputCDR & cdr ); @@ -2573,14 +2573,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::GIOPProtocolProperties> { - static RTCORBA::GIOPProtocolProperties_ptr tao_duplicate ( + static RTCORBA::GIOPProtocolProperties_ptr duplicate ( RTCORBA::GIOPProtocolProperties_ptr ); - static void tao_release ( + static void release ( RTCORBA::GIOPProtocolProperties_ptr ); - static RTCORBA::GIOPProtocolProperties_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::GIOPProtocolProperties_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::GIOPProtocolProperties_ptr p, TAO_OutputCDR & cdr ); @@ -2594,14 +2594,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::UnixDomainProtocolProperties> { - static RTCORBA::UnixDomainProtocolProperties_ptr tao_duplicate ( + static RTCORBA::UnixDomainProtocolProperties_ptr duplicate ( RTCORBA::UnixDomainProtocolProperties_ptr ); - static void tao_release ( + static void release ( RTCORBA::UnixDomainProtocolProperties_ptr ); - static RTCORBA::UnixDomainProtocolProperties_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::UnixDomainProtocolProperties_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::UnixDomainProtocolProperties_ptr p, TAO_OutputCDR & cdr ); @@ -2615,14 +2615,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::SharedMemoryProtocolProperties> { - static RTCORBA::SharedMemoryProtocolProperties_ptr tao_duplicate ( + static RTCORBA::SharedMemoryProtocolProperties_ptr duplicate ( RTCORBA::SharedMemoryProtocolProperties_ptr ); - static void tao_release ( + static void release ( RTCORBA::SharedMemoryProtocolProperties_ptr ); - static RTCORBA::SharedMemoryProtocolProperties_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::SharedMemoryProtocolProperties_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::SharedMemoryProtocolProperties_ptr p, TAO_OutputCDR & cdr ); @@ -2636,14 +2636,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy> { - static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_duplicate ( + static RTCORBA::PriorityBandedConnectionPolicy_ptr duplicate ( RTCORBA::PriorityBandedConnectionPolicy_ptr ); - static void tao_release ( + static void release ( RTCORBA::PriorityBandedConnectionPolicy_ptr ); - static RTCORBA::PriorityBandedConnectionPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::PriorityBandedConnectionPolicy_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::PriorityBandedConnectionPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -2657,14 +2657,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Current> { - static RTCORBA::Current_ptr tao_duplicate ( + static RTCORBA::Current_ptr duplicate ( RTCORBA::Current_ptr ); - static void tao_release ( + static void release ( RTCORBA::Current_ptr ); - static RTCORBA::Current_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::Current_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::Current_ptr p, TAO_OutputCDR & cdr ); @@ -2678,14 +2678,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::Mutex> { - static RTCORBA::Mutex_ptr tao_duplicate ( + static RTCORBA::Mutex_ptr duplicate ( RTCORBA::Mutex_ptr ); - static void tao_release ( + static void release ( RTCORBA::Mutex_ptr ); - static RTCORBA::Mutex_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::Mutex_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::Mutex_ptr p, TAO_OutputCDR & cdr ); @@ -2699,14 +2699,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTCORBA_Export Objref_Traits<RTCORBA::RTORB> { - static RTCORBA::RTORB_ptr tao_duplicate ( + static RTCORBA::RTORB_ptr duplicate ( RTCORBA::RTORB_ptr ); - static void tao_release ( + static void release ( RTCORBA::RTORB_ptr ); - static RTCORBA::RTORB_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTCORBA::RTORB_ptr nil (void); + static CORBA::Boolean marshal ( RTCORBA::RTORB_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index eaf3576ee46..c6c7627011c 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -79,7 +79,7 @@ namespace TAO ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ThreadAction_ptr -TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::duplicate ( RTScheduling::ThreadAction_ptr p ) { @@ -88,7 +88,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::release ( RTScheduling::ThreadAction_ptr p ) { @@ -97,14 +97,14 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ThreadAction_ptr -TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_nil (void) +TAO::Objref_Traits<RTScheduling::ThreadAction>::nil (void) { return RTScheduling::ThreadAction::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::ThreadAction>::tao_marshal ( +TAO::Objref_Traits<RTScheduling::ThreadAction>::marshal ( RTScheduling::ThreadAction_ptr p, TAO_OutputCDR & cdr ) @@ -253,7 +253,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::DistributableThread_ptr -TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::duplicate ( RTScheduling::DistributableThread_ptr p ) { @@ -262,7 +262,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::release ( RTScheduling::DistributableThread_ptr p ) { @@ -271,14 +271,14 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::DistributableThread_ptr -TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_nil (void) +TAO::Objref_Traits<RTScheduling::DistributableThread>::nil (void) { return RTScheduling::DistributableThread::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::DistributableThread>::tao_marshal ( +TAO::Objref_Traits<RTScheduling::DistributableThread>::marshal ( RTScheduling::DistributableThread_ptr p, TAO_OutputCDR & cdr ) @@ -475,7 +475,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Current_ptr -TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate ( +TAO::Objref_Traits<RTScheduling::Current>::duplicate ( RTScheduling::Current_ptr p ) { @@ -484,7 +484,7 @@ TAO::Objref_Traits<RTScheduling::Current>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::Current>::tao_release ( +TAO::Objref_Traits<RTScheduling::Current>::release ( RTScheduling::Current_ptr p ) { @@ -493,14 +493,14 @@ TAO::Objref_Traits<RTScheduling::Current>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Current_ptr -TAO::Objref_Traits<RTScheduling::Current>::tao_nil (void) +TAO::Objref_Traits<RTScheduling::Current>::nil (void) { return RTScheduling::Current::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::Current>::tao_marshal ( +TAO::Objref_Traits<RTScheduling::Current>::marshal ( RTScheduling::Current_ptr p, TAO_OutputCDR & cdr ) @@ -957,7 +957,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ResourceManager_ptr -TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::duplicate ( RTScheduling::ResourceManager_ptr p ) { @@ -966,7 +966,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::release ( RTScheduling::ResourceManager_ptr p ) { @@ -975,14 +975,14 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::ResourceManager_ptr -TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_nil (void) +TAO::Objref_Traits<RTScheduling::ResourceManager>::nil (void) { return RTScheduling::ResourceManager::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::ResourceManager>::tao_marshal ( +TAO::Objref_Traits<RTScheduling::ResourceManager>::marshal ( RTScheduling::ResourceManager_ptr p, TAO_OutputCDR & cdr ) @@ -1136,7 +1136,7 @@ namespace RTScheduling ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Scheduler_ptr -TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate ( +TAO::Objref_Traits<RTScheduling::Scheduler>::duplicate ( RTScheduling::Scheduler_ptr p ) { @@ -1145,7 +1145,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release ( +TAO::Objref_Traits<RTScheduling::Scheduler>::release ( RTScheduling::Scheduler_ptr p ) { @@ -1154,14 +1154,14 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION RTScheduling::Scheduler_ptr -TAO::Objref_Traits<RTScheduling::Scheduler>::tao_nil (void) +TAO::Objref_Traits<RTScheduling::Scheduler>::nil (void) { return RTScheduling::Scheduler::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<RTScheduling::Scheduler>::tao_marshal ( +TAO::Objref_Traits<RTScheduling::Scheduler>::marshal ( RTScheduling::Scheduler_ptr p, TAO_OutputCDR & cdr ) diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 04d83d3528b..f695f3cb712 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -1172,14 +1172,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ThreadAction> { - static RTScheduling::ThreadAction_ptr tao_duplicate ( + static RTScheduling::ThreadAction_ptr duplicate ( RTScheduling::ThreadAction_ptr ); - static void tao_release ( + static void release ( RTScheduling::ThreadAction_ptr ); - static RTScheduling::ThreadAction_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTScheduling::ThreadAction_ptr nil (void); + static CORBA::Boolean marshal ( RTScheduling::ThreadAction_ptr p, TAO_OutputCDR & cdr ); @@ -1193,14 +1193,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::DistributableThread> { - static RTScheduling::DistributableThread_ptr tao_duplicate ( + static RTScheduling::DistributableThread_ptr duplicate ( RTScheduling::DistributableThread_ptr ); - static void tao_release ( + static void release ( RTScheduling::DistributableThread_ptr ); - static RTScheduling::DistributableThread_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTScheduling::DistributableThread_ptr nil (void); + static CORBA::Boolean marshal ( RTScheduling::DistributableThread_ptr p, TAO_OutputCDR & cdr ); @@ -1214,14 +1214,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Current> { - static RTScheduling::Current_ptr tao_duplicate ( + static RTScheduling::Current_ptr duplicate ( RTScheduling::Current_ptr ); - static void tao_release ( + static void release ( RTScheduling::Current_ptr ); - static RTScheduling::Current_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTScheduling::Current_ptr nil (void); + static CORBA::Boolean marshal ( RTScheduling::Current_ptr p, TAO_OutputCDR & cdr ); @@ -1235,14 +1235,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ResourceManager> { - static RTScheduling::ResourceManager_ptr tao_duplicate ( + static RTScheduling::ResourceManager_ptr duplicate ( RTScheduling::ResourceManager_ptr ); - static void tao_release ( + static void release ( RTScheduling::ResourceManager_ptr ); - static RTScheduling::ResourceManager_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTScheduling::ResourceManager_ptr nil (void); + static CORBA::Boolean marshal ( RTScheduling::ResourceManager_ptr p, TAO_OutputCDR & cdr ); @@ -1256,14 +1256,14 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Scheduler> { - static RTScheduling::Scheduler_ptr tao_duplicate ( + static RTScheduling::Scheduler_ptr duplicate ( RTScheduling::Scheduler_ptr ); - static void tao_release ( + static void release ( RTScheduling::Scheduler_ptr ); - static RTScheduling::Scheduler_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static RTScheduling::Scheduler_ptr nil (void); + static CORBA::Boolean marshal ( RTScheduling::Scheduler_ptr p, TAO_OutputCDR & cdr ); diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index 8f357a28467..0cb98e0f718 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -4,11 +4,12 @@ #include "Invocation_Adapter.h" #include "IFR_Client_Adapter.h" #include "ORB_Core.h" +#include "SystemException.h" #include "ace/Dynamic_Service.h" ACE_RCSID (tao, - TAO_Object_Remote_Proxy_Broker, + Remote_Object_Proxy_Broker, "$Id$") namespace TAO diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp index c9f7eb4bc3f..7db5fe67980 100644 --- a/TAO/tao/RequestInfo_Util.cpp +++ b/TAO/tao/RequestInfo_Util.cpp @@ -7,11 +7,14 @@ #include "ORB_Constants.h" #include "StringSeqC.h" #include "DynamicC.h" +#include "SystemException.h" -ACE_RCSID (tao, - RequestInfo_Util, + +ACE_RCSID (tao, + RequestInfo_Util, "$Id$") + Dynamic::ParameterList * TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) { @@ -20,7 +23,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ParameterList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); @@ -37,7 +40,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ExceptionList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); @@ -54,7 +57,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL) Dynamic::ContextList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); @@ -71,7 +74,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL) Dynamic::RequestContext, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); @@ -89,7 +92,7 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any CORBA::Any, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, ENOMEM), CORBA::COMPLETED_NO)); diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h index 0c16e373345..e63dafa4be0 100644 --- a/TAO/tao/Request_Dispatcher.h +++ b/TAO/tao/Request_Dispatcher.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 1290e27a70c..9f538db1292 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -409,8 +409,8 @@ TAO_Object_Manager<T,T_var>::operator= ( if (this->release_) { - TAO::Objref_Traits<T>::tao_release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (*rhs.ptr_); + TAO::Objref_Traits<T>::release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::duplicate (*rhs.ptr_); } else { @@ -430,7 +430,7 @@ TAO_Object_Manager<T,T_var>::operator= (T * p) // that of a var variable. Therefore we will not duplicate the // user provided pointer before assigning it to the internal // variable. - TAO::Objref_Traits<T>::tao_release (*this->ptr_); + TAO::Objref_Traits<T>::release (*this->ptr_); *this->ptr_ = p; } else @@ -451,8 +451,8 @@ TAO_Object_Manager<T,T_var>::operator= (const T_var & p) // that of a var variable. Therefore we duplicate p's // pointer before assigning it to the internal // variable. - TAO::Objref_Traits<T>::tao_release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::tao_duplicate (p.in ()); + TAO::Objref_Traits<T>::release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::duplicate (p.in ()); } else { @@ -466,8 +466,8 @@ template <typename T, typename T_var> T *& TAO_Object_Manager<T,T_var>::out (void) { - TAO::Objref_Traits<T>::tao_release (*this->ptr_); - *this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (*this->ptr_); + *this->ptr_ = TAO::Objref_Traits<T>::nil (); return *this->ptr_; } @@ -476,7 +476,7 @@ T * TAO_Object_Manager<T,T_var>::_retn (void) { T *temp = *this->ptr_; - *this->ptr_ = TAO::Objref_Traits<T>::tao_nil (); + *this->ptr_ = TAO::Objref_Traits<T>::nil (); return temp; } @@ -585,7 +585,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); } this->buffer_ = tmp1; @@ -621,8 +621,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::tao_release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::nil (); } if (this->maximum_ < rhs.maximum_) @@ -656,7 +656,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); } return *this; @@ -675,7 +675,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf ( for (CORBA::ULong i = 0; i < nelems; ++i) { - buf[i] = TAO::Objref_Traits<T>::tao_nil (); + buf[i] = TAO::Objref_Traits<T>::nil (); } return buf; @@ -727,7 +727,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer ( // the old instances. if (!this->release_) { - tmp[i] = TAO::Objref_Traits<T>::tao_duplicate (old[i]); + tmp[i] = TAO::Objref_Traits<T>::duplicate (old[i]); } else { @@ -759,8 +759,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::tao_release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::nil (); } TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp); @@ -782,8 +782,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer ( for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Objref_Traits<T>::tao_release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::nil (); } } @@ -817,7 +817,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); } this->buffer_ = tmp1; @@ -846,8 +846,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Objref_Traits<T>::tao_release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::nil (); } // No need to reallocate the buffer since it is always of size // MAX @@ -876,7 +876,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( for (CORBA::ULong i=0; i < rhs.length_; ++i) { - tmp1[i] = TAO::Objref_Traits<T>::tao_duplicate (tmp2[i]); + tmp1[i] = TAO::Objref_Traits<T>::duplicate (tmp2[i]); } return *this; @@ -895,7 +895,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf ( for (CORBA::ULong i = 0; i < MAX; ++i) { - buf[i] = TAO::Objref_Traits<T>::tao_nil (); + buf[i] = TAO::Objref_Traits<T>::nil (); } return buf; @@ -910,10 +910,10 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (T ** buffer) // complaint and call CORBA::release() on each one. for (CORBA::ULong i = 0; i < MAX; ++i) { - if (buffer[i] != TAO::Objref_Traits<T>::tao_nil ()) + if (buffer[i] != TAO::Objref_Traits<T>::nil ()) { - TAO::Objref_Traits<T>::tao_release (buffer[i]); - buffer[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (buffer[i]); + buffer[i] = TAO::Objref_Traits<T>::nil (); } } @@ -962,8 +962,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer ( for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Objref_Traits<T>::tao_release (tmp[i]); - tmp[i] = TAO::Objref_Traits<T>::tao_nil (); + TAO::Objref_Traits<T>::release (tmp[i]); + tmp[i] = TAO::Objref_Traits<T>::nil (); } } @@ -1395,7 +1395,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence ( rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]); + TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]); } this->buffer_ = tmp1; @@ -1466,7 +1466,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::tao_copy ( + TAO::Array_Traits<T,T_slice,TAG>::copy ( ACE_reinterpret_cast (T *, this->buffer_)[i], ACE_reinterpret_cast (const T *, @@ -1544,7 +1544,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer ( T* old = (T *) this->buffer_; for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp[i], old[i]); + TAO::Array_Traits<T,T_slice,TAG>::copy (tmp[i], old[i]); } if (this->release_) @@ -1631,7 +1631,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::tao_copy (tmp1[i], tmp2[i]); + TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]); } this->buffer_ = tmp1; @@ -1683,7 +1683,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Array_Traits<T,T_slice,TAG>::tao_copy ( + TAO::Array_Traits<T,T_slice,TAG>::copy ( ((T *) this->buffer_)[i], ((const T *) rhs.buffer_)[i] ); diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i index 1575fbf085a..c1ecd508680 100644 --- a/TAO/tao/Sequence_T.i +++ b/TAO/tao/Sequence_T.i @@ -159,7 +159,7 @@ template <typename T, typename T_var> ACE_INLINE TAO_Object_Manager<T,T_var>::operator const T_var () const { - return TAO::Objref_Traits<T>::tao_duplicate (*this->ptr_); + return TAO::Objref_Traits<T>::duplicate (*this->ptr_); } template <typename T, typename T_var> diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index 80f905477e9..c5d69c476e3 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -1,6 +1,6 @@ #include "Service_Callbacks.h" #include "ORB_Constants.h" -#include "Exception.h" +#include "SystemException.h" #include "Environment.h" #include "Invocation_Utils.h" diff --git a/TAO/tao/Services_Activate.h b/TAO/tao/Services_Activate.h index 7e75c1aac4c..582d6d3b94a 100644 --- a/TAO/tao/Services_Activate.h +++ b/TAO/tao/Services_Activate.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_ORB_Core; class TAO_Service_Callbacks; diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 39c2430adce..ea7a4bcb47c 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -15,6 +15,7 @@ #include "Sync_Strategies.h" #include "debug.h" #include "Policy_Manager.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "Stub.i" diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index a36c0aa427f..b6e08c6d4eb 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -86,7 +86,7 @@ namespace TAO ACE_THROW_RETURN ( CORBA::INTERNAL ( - TAO_DEFAULT_MINOR_CODE, + 0, CORBA::COMPLETED_NO), s); } @@ -408,7 +408,7 @@ namespace TAO { // Could not demarshal the addressing disposition, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -482,7 +482,7 @@ namespace TAO { // Could not demarshal the exception id, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -541,7 +541,7 @@ namespace TAO { // Could not demarshal the exception id, raise an local // CORBA::MARSHAL - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } @@ -552,7 +552,7 @@ namespace TAO if ((cdr >> minor) == 0 || (cdr >> completion) == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO_INVOKE_FAILURE); } diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 6e73aed1f36..4f47a01e192 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" class TAO_Operation_Details; class TAO_Synch_Reply_Dispatcher; @@ -28,11 +28,6 @@ class TAO_InputCDR; class ACE_Time_Value; class TAO_Bind_Dispatcher_Guard; -namespace CORBA -{ - class SystemException; -} - namespace TAO { class Profile_Transport_Resolver; diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp new file mode 100644 index 00000000000..50c7857e86e --- /dev/null +++ b/TAO/tao/SystemException.cpp @@ -0,0 +1,1188 @@ +// $Id$ + +#include "SystemException.h" +#include "Environment.h" +#include "Any_SystemException.h" +#include "Any_Dual_Impl_T.h" +#include "Typecode.h" +#include "ORB_Constants.h" +#include "TC_Constants_Forward.h" +#include "CORBA_String.h" +#include "CDR.h" +#include "debug.h" + +#include "ace/Malloc.h" +#include "ace/SString.h" +#include "ace/OS_NS_string.h" + + +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +// Needed for ostream& operator<< (ostream &os, const CORBA::Exception &e) +// FUZZ: disable check_for_streams_include +#include "ace/streams.h" +#endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */ + +#if !defined (__ACE_INLINE__) +# include "tao/SystemException.inl" +#endif /* __ACE_INLINE__ */ + + +ACE_RCSID (tao, + SystemException, + "$Id$") + + +ACE_Allocator *TAO_Exceptions::global_allocator_; + +// Flag that denotes that the TAO TypeCode constants have been +// initialized. +bool TAO_Exceptions::initialized_ = false; + +namespace CORBA +{ + CORBA::TypeCode_ptr _tc_UnknownUserException = 0; +} + +namespace TAO +{ + // TAO specific typecode. + extern CORBA::TypeCode_ptr TC_completion_status; +} + + +/** + * @name @c errno Encoding + * + * The @c errno encoding is located in the bottom 7 bits. + */ +//@{ +const CORBA::ULong TAO_UNSPECIFIED_MINOR_CODE = 0x0U; +const CORBA::ULong TAO_ETIMEDOUT_MINOR_CODE = 0x1U; +const CORBA::ULong TAO_ENFILE_MINOR_CODE = 0x2U; +const CORBA::ULong TAO_EMFILE_MINOR_CODE = 0x3U; +const CORBA::ULong TAO_EPIPE_MINOR_CODE = 0x4U; +const CORBA::ULong TAO_ECONNREFUSED_MINOR_CODE = 0x5U; +const CORBA::ULong TAO_ENOENT_MINOR_CODE = 0x6U; +const CORBA::ULong TAO_EBADF_MINOR_CODE = 0x7U; +const CORBA::ULong TAO_ENOSYS_MINOR_CODE = 0x8U; +const CORBA::ULong TAO_EPERM_MINOR_CODE = 0x9U; +const CORBA::ULong TAO_EAFNOSUPPORT_MINOR_CODE = 0xAU; +const CORBA::ULong TAO_EAGAIN_MINOR_CODE = 0xBU; +const CORBA::ULong TAO_ENOMEM_MINOR_CODE = 0xCU; +const CORBA::ULong TAO_EACCES_MINOR_CODE = 0xDU; +const CORBA::ULong TAO_EFAULT_MINOR_CODE = 0xEU; +const CORBA::ULong TAO_EBUSY_MINOR_CODE = 0xFU; +const CORBA::ULong TAO_EEXIST_MINOR_CODE = 0x10U; +const CORBA::ULong TAO_EINVAL_MINOR_CODE = 0x11U; +const CORBA::ULong TAO_ECOMM_MINOR_CODE = 0x12U; +const CORBA::ULong TAO_ECONNRESET_MINOR_CODE = 0x13U; +const CORBA::ULong TAO_ENOTSUP_MINOR_CODE = 0x14U; +// *Don't* use TAO_<errno>_MINOR_CODE greater than 0x7FU! +//@} + +// **************************************************************** + +CORBA::SystemException::SystemException (void) + : minor_ (0), + completed_ (CORBA::COMPLETED_NO) +{ +} + +CORBA::SystemException::SystemException (const char *repository_id, + const char *local_name, + CORBA::ULong code, + CORBA::CompletionStatus completed) + : CORBA::Exception (repository_id, + local_name), + minor_ (code), + completed_ (completed) +{ +} + +CORBA::SystemException::SystemException (CORBA::ULong code, + CORBA::CompletionStatus completed) + : minor_ (code), + completed_ (completed) +{ +} + + +CORBA::SystemException::SystemException (const CORBA::SystemException &src) + : CORBA::Exception (src), + minor_ (src.minor_), + completed_ (src.completed_) +{ +} + +CORBA::SystemException::~SystemException (void) +{ +} + +CORBA::SystemException & +CORBA::SystemException::operator= (const CORBA::SystemException &src) +{ + this->Exception::operator= (src); + + this->minor_ = src.minor_; + this->completed_ = src.completed_; + + return *this; +} + + +int +CORBA::SystemException::_is_a (const char* interface_id) const +{ + return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) || + (ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/SystemException:1.0") == 0) + || this->Exception::_is_a (interface_id)); +} + +CORBA::SystemException* +CORBA::SystemException::_downcast (CORBA::Exception* exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) + { + return dynamic_cast<CORBA::SystemException *> (exception); + } + + return 0; +} + +const CORBA::SystemException* +CORBA::SystemException::_downcast (const CORBA::Exception *exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) + { + return dynamic_cast<const CORBA::SystemException *> (exception); + } + + return 0; +} + +void +CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL) const +{ + if (cdr.write_string (this->_rep_id ()) + && cdr.write_ulong (this->minor ()) + && cdr.write_ulong (this->completed ())) + { + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +void +CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr + ACE_ENV_ARG_DECL) +{ + // The string is read by the caller, to determine the exact type of + // the exception. We just decode the fields... + // cdr.read_string (this->id ()); + CORBA::ULong tmp; + + if (cdr.read_ulong (this->minor_) + && cdr.read_ulong (tmp)) + { + this->completed_ = CORBA::CompletionStatus (tmp); + return; + } + + ACE_THROW (CORBA::MARSHAL ()); +} + +CORBA::ULong +CORBA::SystemException::_tao_errno (int errno_value) +{ + switch (errno_value) + { + case 0: + return TAO_UNSPECIFIED_MINOR_CODE; + case ETIMEDOUT: + return TAO_ETIMEDOUT_MINOR_CODE; + case ENFILE: + return TAO_ENFILE_MINOR_CODE; + case EPIPE: + return TAO_EPIPE_MINOR_CODE; + case ECONNREFUSED: + return TAO_ECONNREFUSED_MINOR_CODE; + case ENOENT: + return TAO_ENOENT_MINOR_CODE; + +#if !defined (ACE_HAS_WINCE) + case EMFILE: + return TAO_EMFILE_MINOR_CODE; + case EBADF: + return TAO_EBADF_MINOR_CODE; + case EPERM: + return TAO_EPERM_MINOR_CODE; + case EINVAL: + return TAO_EINVAL_MINOR_CODE; +#endif // ACE_HAS_WINCE + +#if (ENOSYS != EFAULT) + case ENOSYS: + return TAO_ENOSYS_MINOR_CODE; +#endif /* ENOSYS != EFAULT */ + case EAFNOSUPPORT: + return TAO_EAFNOSUPPORT_MINOR_CODE; + case EAGAIN: + return TAO_EAGAIN_MINOR_CODE; + case ENOMEM: + return TAO_ENOMEM_MINOR_CODE; + case EACCES: + return TAO_EACCES_MINOR_CODE; + case EFAULT: + return TAO_EFAULT_MINOR_CODE; + case EBUSY: + return TAO_EBUSY_MINOR_CODE; + case EEXIST: + return TAO_EEXIST_MINOR_CODE; + case ECOMM: + return TAO_ECOMM_MINOR_CODE; + case ECONNRESET: + return TAO_ECONNRESET_MINOR_CODE; +#if (ENOTSUP != ENOSYS) + case ENOTSUP: + return TAO_ENOTSUP_MINOR_CODE; +#endif /* ENOSYS != EFAULT */ + default: + // Mask off bottom 7 bits and return them. + return errno_value & 0x7FU; + } +} + +CORBA::ULong +CORBA::SystemException::_tao_minor_code (u_int location, + int errno_value) +{ + return + TAO::VMCID + | location + | _tao_errno (errno_value); +} + +void +CORBA::SystemException::_tao_print_system_exception (FILE *) const +{ + ACE_DEBUG ((LM_ERROR, + ACE_TEXT("(%P|%t) system exception, ID '%s'\n"), + ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ()))); +} + +ACE_CString +CORBA::SystemException::_info (void) const +{ + // @@ there are a few other "user exceptions" in the CORBA scope, + // they're not all standard/system exceptions ... really need to + // either compare exhaustively against all those IDs (yeech) or + // (preferably) to represent the exception type directly in the + // exception value so it can be queried. + + ACE_CString info = "system exception, ID '"; + info += this->_rep_id (); + info += "'\n"; + + const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u; + + if (VMCID == TAO_DEFAULT_MINOR_CODE) + { + // @@ Move the following code to a subroutine, it is too long already! + const char *location; + switch (this->minor () & 0x00000F80u) + { + case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE: + location = "location forward failed"; + break; + case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE: + location = "send request failed"; + break; + case TAO_POA_DISCARDING: + location = "poa in discarding state"; + break; + case TAO_POA_HOLDING: + location = "poa in holding state"; + break; + case TAO_POA_INACTIVE: + location = "poa in inactive state"; + break; + case TAO_UNHANDLED_SERVER_CXX_EXCEPTION: + location = "unhandled c++ exception in server side"; + break; + case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE: + location = "failed to recv request response"; + break; + case TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL: + location = "all protocols failed to parse the IOR"; + break; + case TAO_MPROFILE_CREATION_ERROR: + location = "error during MProfile creation"; + break; + case TAO_TIMEOUT_CONNECT_MINOR_CODE: + location = "timeout during connect"; + break; + case TAO_TIMEOUT_SEND_MINOR_CODE: + location = "timeout during send"; + break; + case TAO_TIMEOUT_RECV_MINOR_CODE: + location = "timeout during recv"; + break; + case TAO_IMPLREPO_MINOR_CODE: + location = "implrepo server exception"; + break; + case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE: + location = "endpoint initialization failure in Acceptor Registry"; + break; + case TAO_ORB_CORE_INIT_LOCATION_CODE: + location = "ORB Core initialization failed"; + break; + case TAO_POLICY_NARROW_CODE: + location = "Failure when narrowing a Policy"; + break; + case TAO_GUARD_FAILURE: + location = "Failure when trying to acquire a guard/monitor"; + break; + case TAO_POA_BEING_DESTROYED: + location = "POA has been destroyed or is currently being destroyed"; + break; + case TAO_AMH_REPLY_LOCATION_CODE: + location = "Failure when trying to send AMH reply"; + break; + case TAO_RTCORBA_THREAD_CREATION_LOCATION_CODE: + location = "Failure in thread creation for RTCORBA thread pool"; + break; + default: + location = "unknown location"; + } + + const char *errno_indication; + char unknown_errno [255]; + CORBA::ULong minor_code = this->minor () & 0x7FU; + switch (minor_code) + { + case TAO_UNSPECIFIED_MINOR_CODE: + errno_indication = "unspecified errno"; + break; + case TAO_ETIMEDOUT_MINOR_CODE: + errno_indication = "ETIMEOUT"; + break; + case TAO_ENFILE_MINOR_CODE: + errno_indication = "ENFILE"; + break; + case TAO_EMFILE_MINOR_CODE: + errno_indication = "EMFILE"; + break; + case TAO_EPIPE_MINOR_CODE: + errno_indication = "EPIPE"; + break; + case TAO_ECONNREFUSED_MINOR_CODE: + errno_indication = "ECONNREFUSED"; + break; + case TAO_ENOENT_MINOR_CODE: + errno_indication = "ENOENT"; + break; + case TAO_EBADF_MINOR_CODE: + errno_indication = "EBADF"; + break; + case TAO_ENOSYS_MINOR_CODE: + errno_indication = "ENOSYS"; + break; + case TAO_EPERM_MINOR_CODE: + errno_indication = "EPERM"; + break; + case TAO_EAFNOSUPPORT_MINOR_CODE: + errno_indication = "EAFNOSUPPORT"; + break; + case TAO_EAGAIN_MINOR_CODE: + errno_indication = "EAGAIN"; + break; + case TAO_ENOMEM_MINOR_CODE: + errno_indication = "ENOMEM"; + break; + case TAO_EACCES_MINOR_CODE: + errno_indication = "EACCES"; + break; + case TAO_EFAULT_MINOR_CODE: + errno_indication = "EFAULT"; + break; + case TAO_EBUSY_MINOR_CODE: + errno_indication = "EBUSY"; + break; + case TAO_EEXIST_MINOR_CODE: + errno_indication = "EEXIST"; + break; + case TAO_EINVAL_MINOR_CODE: + errno_indication = "EINVAL"; + break; + case TAO_ECOMM_MINOR_CODE: + errno_indication = "ECOMM"; + break; + case TAO_ECONNRESET_MINOR_CODE: + errno_indication = "ECONNRESET"; + break; + case TAO_ENOTSUP_MINOR_CODE: + errno_indication = "ENOTSUP"; + break; + default: + { + // 7 bits of some other errno. + ACE_OS::sprintf (unknown_errno, + "low 7 bits of errno: %3u %s", + minor_code, ACE_OS::strerror (minor_code)); + + errno_indication = unknown_errno; + } + } + + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "TAO exception, " + "minor code = %x (%s; %s), " + "completed = %s\n", + minor_code, + location, + errno_indication, + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + else if (VMCID == CORBA::OMGVMCID) + { + const CORBA::ULong minor_code = this->minor () & 0xFFFU; + + const char *minor_description = 0; + + if (minor_code > 0) + minor_description = + CORBA::SystemException::_tao_get_omg_exception_description ( + *this, + minor_code); + else + minor_description = "*unknown description*"; + + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "OMG minor code (%d), " + "described as '%s', " + "completed = %s\n", + minor_code, + minor_description, + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + else + { + char buffer[BUFSIZ]; + ACE_OS::sprintf (buffer, + "Unknown vendor minor code id (%x), " + "minor code = %x, completed = %s\n", + VMCID, + this->minor (), // Use the raw minor code + (completed () == CORBA::COMPLETED_YES) ? "YES" : + (completed () == CORBA::COMPLETED_NO) ? "NO" : + (completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage"); + + info += buffer; + } + + return info; +} + +const char * +CORBA::SystemException::_tao_get_omg_exception_description ( + const CORBA::SystemException &exc, + CORBA::ULong minor_code) +{ +#ifndef ACE_NDEBUG + + static const char *UNKNOWN_TABLE[] = + { + "Unlisted user exception received by client.", // 1 + "Non-standard SystemException not supported.", // 2 + "An unkown user exception received by a portable interceptor." // 3 + }; + + static const char *BAD_PARAM_TABLE[] = + { + "Failure to register, unregister, or lookup value factory.", // 1 + "RID already defined in IFR.", // 2 + "Name already used in the context in IFR.", // 3 + "Target is not a valid container.", // 4 + "Name clash in inherited context.", // 5 + "Incorrect type for abstract interface.", // 6 + "string_to_object conversion failed due to a bad scheme name.", // 7 + "string_to_object conversion failed due to a bad address.", // 8 + "string_to_object conversion failed due to a bad schema specific part.",// 9 + "string_to_object conversion failed due to non specific reason.", // 10 + "Attempt to derive abstract interface from non-abstract base interface in the Interface Repository.", // 11 + "Attempt to let a ValueDef support more than one non-abstract interface in the Interface Repository.", // 12 + "Attempt to use an incomplete TypeCode as a parameter.", // 13 + "Invalid object id passed to POA::create_reference_by_id.", // 14 + "Bad name argument in TypeCode operation.", // 15 + "Bad RepositoryId argument in TypeCode operation.", // 16 + "Invalid member namein TypeCode operation.", // 17 + "Duplicate label value in create_union_tc.", // 18 + "Incompatible TypeCode of label and discriminator in create_union_tc.", // 19 + "Supplied discriminator type illegitimate in create_union_tc.", // 20 + "Any passed to ServerRequest::set_exception does not contain an exception.", // 21 + "Unlisted user exception passed to ServerRequest::set_exception", // 22 + "wchar transmission code set not in service context.", // 23 + "Service context is not in OMG-defined range.", // 24 + "Enum value out of range.", // 25 + "Invalid service context Id in portable interceptor.", // 26 + "Attempt to call register_initial_reference with a null Object.", // 27 + "Invalid component Id in portable interceptor.", // 28 + "Invalid profile Id in portable interceptor.", // 29 + "Two or more Policy objects with the same PolicyType value supplied to Object::set_policy_overrides or PolicyManager::set_policy_overrides." // 30 + "Attempt to define a oneway operation with non-void result, out or inout parameters or user exceptions.", // 31 + "DII asked to create request for an implicit operation.", // 32, + "An OTS/XA integration xa_ call returned XAER_INVAL.", // 33 + "Union branch modifier called with bad case label discriminator.", // 34 + "Illegal IDL context property name.", // 35 + "Illegal IDL property search string.", // 36 + "Illegal IDL context name.", // 37 + "Non-empty IDL context.", // 38 + "Servant not found [ServantManager].", // 39 + "ORB output stream does not support ValueOutputStream interface.", // 40 + "ORB input stream does not support ValueInputStream interface." // 41 + }; + + static const char *IMP_LIMIT_TABLE[] = + { + "Unable to use any profile in IOR." // 1 + }; + + static const char *INITIALIZE_TABLE[] = + { + "Priority range too restricted for ORB." // 1 + }; + + + static const char *INV_OBJREF_TABLE[] = + { + "wchar Code Set support not specified.", // 1 + "Codeset component required for type using wchar or wstring data." // 2 + }; + + static const char *MARSHAL_TABLE[] = + { + "Unable to locate value factory.", // 1 + "ServerRequest::set_result called before ServerRequest::ctx when the operation IDL contains a context clause.", // 2 + "NVList passed to ServerRequest::arguments does not describe all parameters passed by client.", // 3 + "Attempt to marshal Local object.", // 4 + "wchar or wstring data erroneously sent by client over GIOP 1.0 connection.", // 5 + "wchar or wstring data erroneously returned by server over GIOP 1.0 connection." //6 + "Unsupported RMI/IDL custom value type stream format." // 7 + }; + + static const char *BAD_TYPECODE_TABLE[] = + { + "Attempt to marshal incomplete TypeCode.", // 1 + "Member type code illegitimate in TypeCode operation.", // 2 + "Illegal parameter type." // 3 + }; + + static const char *NO_IMPLEMENT_TABLE[] = + { + "Missing local value implementation.", // 1 + "Incompatible value implementation version.", // 2 + "Unable to use any profile in IOR.", // 3 + "Attempt to use DII on Local object.", // 4 + "Biomolecular Sequence Analysis iterator cannot be reset.", // 5 + "Biomolecular Sequence Analysis metadata is not available as XML.", // 6 + "Genomic Maps iterator cannot be rest." // 7 + }; + + static const char *NO_RESOURCE_TABLE[] = + { + "Portable Interceptor operation not support in this binding.", // 1 + "No connection for request's priority." // 2 + }; + + static const char *BAD_INV_ORDER_TABLE[] = + { + "Dependency exists in IFR preventing destruction of this object", // 1 + "Attempt to destroy indestructible objects in IFR.", // 2 + "Operation would deadlock.", // 3 + "ORB has shutdown.", // 4 + "Attempt to invoke \"send\" or \"invoke\" operation of the same \"Request\" object more than once.", // 5 + "Attempt to set a servant manager after one has already been set.", // 6 + "ServerRequest::arguments called more than once or after a call to ServerRequest::set_exception.", // 7 + "ServerRequest::ctx called more than once or before ServerRequest::arguments or after ServerRequest::ctx, ServerRequest::set_result or ServerRequest::set_exception.", // 8 + "ServerRequest::result called more than once or before ServerRequest::arguments or after ServerRequest::set_result or ServerRequest::set_exception.", // 9 + "Attempt to send a DII request after it was sent previously.", // 10 + "Attempt to poll a DII request or to retrieve its result before the request was sent.", // 11 + "Attempt to poll a DII request or to retrieve its result after the result was retrieved previously.", // 12 + "Attempt to poll a synchronous DII request or to retrieve results from a synchronous DII request.", // 13 + "Invalid portable interceptor call", // 14 + "Service context add failed in portable interceptor because a service context with the given id already exists.", // 15 + "Registration of PolicyFactory failed because a factory already exists for the given type.", // 16 + "POA cannot create POAs while undergoing destruction." // 17 + }; + + static const char *TRANSIENT_TABLE[] = + { + "Request discarded due to resource exhaustion in POA, or because POA is in discarding state.", // 1 + "No usable profile in IOR.", // 2 + "Request cancelled.", // 3 + "POA destroyed." // 4 + }; + + static const char *OBJ_ADAPTER_TABLE[] = + { + "System exception in POA::unknown_adapter.", // 1 + "Incorrect servant type returned by servant manager", // 2 + "No default servant available [POA policy].", // 3 + "No servant manager available [POA policy].", // 4 + "Violation of POA policy by ServantActivator::incarnate.",// 5 + "Exception in PortableInterceptor::IORInterceptor::components_established.", // 6 + "Null servant returned by servant manager." // 7 + }; + + static const char *DATA_CONVERSION_TABLE[] = + { + "Character does not map to negotiated transmission code set.", // 1 + "Failure of PriorityMapping object." // 2 + }; + + static const char *OBJECT_NOT_EXIST_TABLE[] = + { + "Attempt to pass an unactivated (unregistered) value as an object reference.", // 1 + "POAManager::incarnate failed to create POA." // 2 + }; + + static const char *INV_POLICY_TABLE[] = + { + "Unable to reconcile IOR specified policy with the effective policy override." // 1 + "Invalid PolicyType.", // 2 + "No PolicyFactory has been registered for the given PolicyType." // 3 + }; + + if (minor_code == 0) + return "*unknown description*"; + + minor_code--; // Adjust to match table offset. + + if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0") + && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *)) + return UNKNOWN_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0") + && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *)) + return BAD_PARAM_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0") + && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *)) + return IMP_LIMIT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0") + && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *)) + return INITIALIZE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0") + && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *)) + return INV_OBJREF_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0") + && minor_code < sizeof MARSHAL_TABLE / sizeof (char *)) + return MARSHAL_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0") + && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *)) + return BAD_TYPECODE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0") + && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *)) + return NO_IMPLEMENT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0") + && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *)) + return NO_RESOURCE_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0") + && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *)) + return BAD_INV_ORDER_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0") + && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *)) + return TRANSIENT_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") + && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *)) + return OBJ_ADAPTER_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0") + && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *)) + return DATA_CONVERSION_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0") + && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *)) + return OBJECT_NOT_EXIST_TABLE[minor_code]; + + if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0") + && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *)) + return INV_POLICY_TABLE[minor_code]; + +#else + ACE_UNUSED_ARG (exc); + ACE_UNUSED_ARG (minor_code); +#endif /* !ACE_NDEBUG */ + + return "*unknown description*"; +} + +// Note that "buffer" holds the (unscoped) name originally, and is +// then overwritten. + +void +TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp + ACE_ENV_ARG_DECL) +{ + // Create the TypeCode for the CORBA::UnknownUserException. + TAO_OutputCDR stream (0, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); + + static const char * interface_id = + "IDL:omg.org/CORBA/UnknownUserException:1.0"; + static const char * name = "UnknownUserException"; + static const char * field_name = "exception"; + + const CORBA::Boolean result = + (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 + || stream.write_string (interface_id) == 0 + || stream.write_string (name) == 0 + || stream.write_ulong (1L) == 0 + || stream.write_string (field_name) == 0); + + if (result) + ACE_THROW (CORBA::INITIALIZE ()); + + if (!(stream << CORBA::_tc_any)) + ACE_THROW (CORBA::INITIALIZE ()); + + ACE_NEW_THROW_EX (tcp, + CORBA::TypeCode (CORBA::tk_except, + stream.length (), + stream.buffer (), + 1, + sizeof (CORBA::UserException)), + CORBA::INITIALIZE ()); +} + +void +TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, + const char *name, + char *buffer, + size_t buflen + ACE_ENV_ARG_DECL) +{ + // This function must only be called ONCE, and with a global lock + // held! The <CORBA::ORB_init> method is responsible for ensuring + // this. + static const char *minor = "minor"; + static const char *completed = "completed"; + + // Create a CDR stream ... juggle the alignment here a bit, we know + // it's good enough for the typecode. + +#if defined(ACE_MVS) + // @@ We need to use a translator to make sure that all TypeCodes + // are stored in ISO8859 form, the problem is that this hack does + // not scale as more native sets have to be supported + + ACE_IBM1047_ISO8859 translator; + TAO_OutputCDR stream (buffer, + buflen, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF, + &translator); +#else + TAO_OutputCDR stream (buffer, + buflen, + ACE_CDR_BYTE_ORDER, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + TAO_Exceptions::global_allocator_, + ACE_DEFAULT_CDR_MEMCPY_TRADEOFF); +#endif /* ACE_MVS */ + + // into CDR stream, stuff (in order): + // - byte order flag [4 bytes] + // - exception ID [27 + N bytes] + // - exception name [4 + N bytes ] + // - number of members (2) [4 bytes ] + // - foreach member, { name string, typecode } [~40 bytes] + + static const char prefix[] = "IDL:omg.org/CORBA/"; + static const char suffix[] = ":1.0"; + char * full_id = + CORBA::string_alloc (sizeof prefix + + static_cast<CORBA::ULong> (ACE_OS::strlen (name)) + + sizeof suffix); + + CORBA::String_var safe_full_id = full_id; + + ACE_OS::strcpy (full_id, prefix); + ACE_OS::strcat (full_id, name); + ACE_OS::strcat (full_id, suffix); + + CORBA::Boolean result = stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0 + || stream.write_string (full_id) == 0 + || stream.write_string (name) == 0 + || stream.write_ulong (2L) != 1 + || stream.write_string (minor) == 0; + + result = result || !(stream << CORBA::_tc_ulong); + + (void) safe_full_id.out (); // No longer need the string + + result = result || stream.write_string (completed) == 0; + result = result || !(stream << TAO::TC_completion_status); + + if (result) + ACE_THROW (CORBA::INITIALIZE ()); + + // @@ It is possible to throw an exception at this point? + // What if the exception typecode has not been initialized yet? + + // OK, we stuffed the buffer we were given (or grew a bigger one; + // hope to avoid that during initialization). Now build and return + // a TypeCode, saving it away in the list of ones that the ORB will + // always accept as part of any operation response! + + ACE_NEW_THROW_EX (tcp, + CORBA::TypeCode (CORBA::tk_except, + stream.length (), + stream.buffer (), + 1, + sizeof (CORBA::SystemException)), + CORBA::INITIALIZE ()); + ACE_CHECK; + + ACE_ASSERT (tcp->length_ <= buflen); + return; +} + +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + + +// List of standard/system exceptions ... used to create static +// storage for their typecodes, then later to initialize that storage +// using the routine above. (It's just too painful to init these +// typecodes statically in all cases!) + +#define STANDARD_EXCEPTION_LIST \ + TAO_SYSTEM_EXCEPTION (UNKNOWN) \ + TAO_SYSTEM_EXCEPTION (BAD_PARAM) \ + TAO_SYSTEM_EXCEPTION (NO_MEMORY) \ + TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \ + TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \ + TAO_SYSTEM_EXCEPTION (INV_OBJREF) \ + TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \ + TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \ + TAO_SYSTEM_EXCEPTION (INTERNAL) \ + TAO_SYSTEM_EXCEPTION (MARSHAL) \ + TAO_SYSTEM_EXCEPTION (INITIALIZE) \ + TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \ + TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \ + TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \ + TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \ + TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \ + TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \ + TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \ + TAO_SYSTEM_EXCEPTION (TRANSIENT) \ + TAO_SYSTEM_EXCEPTION (FREE_MEM) \ + TAO_SYSTEM_EXCEPTION (INV_IDENT) \ + TAO_SYSTEM_EXCEPTION (INV_FLAG) \ + TAO_SYSTEM_EXCEPTION (INTF_REPOS) \ + TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \ + TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \ + TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \ + TAO_SYSTEM_EXCEPTION (INV_POLICY) \ + TAO_SYSTEM_EXCEPTION (REBIND) \ + TAO_SYSTEM_EXCEPTION (TIMEOUT) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \ + TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \ + TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \ + TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \ + TAO_SYSTEM_EXCEPTION (BAD_QOS) \ + TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \ + TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \ + TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \ + TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) + +// Declare static storage for these ... the buffer is "naturally" +// aligned and overwritten. +// +// @@ this actually doesn't guarantee "natural" alignment, but +// it works that way in most systems. + +#define TAO_TC_BUF_LEN 256 + +static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; + +#define TAO_SYSTEM_EXCEPTION(name) \ + CORBA::TypeCode_ptr CORBA::_tc_ ## name = 0; + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + + static CORBA::TypeCode_ptr *type_code_array [] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + &CORBA::_tc_ ## name, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + &CORBA::_tc_null}; + +// Since we add an extra element subtract 1 +static const CORBA::ULong array_sz = + (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1; + +static const char *repo_id_array[] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + (char *) "IDL:omg.org/CORBA/" #name ":1.0", + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + + +TAO::excp_factory excp_array [] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + &CORBA::name::_tao_create, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + +void +TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) +{ + // This routine should only be called once. + + // Not thread safe. Caller must provide synchronization. + + if (TAO_Exceptions::initialized_) + { + return; + } + + // Initialize the start up allocator. + ACE_NEW (TAO_Exceptions::global_allocator_, + ACE_New_Allocator); + + static const char *name_array[] = { +#define TAO_SYSTEM_EXCEPTION(name) \ + # name, + STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + 0 + }; + + for (CORBA::ULong i = 0; i < array_sz; ++i) + { + TAO_Exceptions::make_standard_typecode (*type_code_array[i], + name_array[i], + (char*) tc_buf_CORBA, + sizeof tc_buf_CORBA + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + } + + TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException + ACE_ENV_ARG_PARAMETER); + + TAO_Exceptions::initialized_ = true; +} + +#undef TAO_TC_BUF_LEN + +CORBA::SystemException * +TAO_Exceptions::create_system_exception (const char *id + ACE_ENV_ARG_DECL_NOT_USED) +{ + for (CORBA::ULong i = 0; i < array_sz; ++i) + { + if (ACE_OS::strcmp (id, repo_id_array[i]) == 0) + return (*(excp_array[i])) (); + } + + return 0; +} + +void +TAO_Exceptions::fini (void) +{ + for (CORBA::ULong i = 0; i < array_sz; ++i) + { + CORBA::release (*type_code_array[i]); + *type_code_array[i] = 0; + } + + CORBA::release (CORBA::_tc_UnknownUserException); + CORBA::_tc_UnknownUserException = 0; + + delete TAO_Exceptions::global_allocator_; + TAO_Exceptions::global_allocator_ = 0; +} + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::name * \ +CORBA::name ::_downcast (CORBA::Exception* exception) \ +{ \ + if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \ + return dynamic_cast<CORBA::name *> (exception); \ + return 0; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::name ::_raise (void) const \ +{ \ + TAO_RAISE (*this); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +// SystemException constructors +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::name ::name (void) \ + : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ + 0, \ + CORBA::COMPLETED_NO) \ +{ \ +} \ +\ +CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \ + : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ + code, \ + completed) \ +{ \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::TypeCode_ptr \ +CORBA::name ::_type (void) const \ +{ \ + return CORBA::_tc_ ## name; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::name ::_tao_any_destructor (void *x) \ +{ \ + CORBA::name *tmp = static_cast<CORBA::name *> (x); \ + delete tmp; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::Exception * \ +CORBA::name ::_tao_duplicate (void) const \ +{ \ + CORBA::Exception *result; \ + ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ + return result; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::SystemException * \ +CORBA::name ::_tao_create (void) \ +{ \ + CORBA::name *result; \ + ACE_NEW_RETURN (result, CORBA::name (), 0); \ + return result; \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ +{ \ + TAO::Any_SystemException::insert_copy ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + ex \ + ); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +void \ +CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \ +{ \ + TAO::Any_SystemException::insert ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + ex \ + ); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION + +#define TAO_SYSTEM_EXCEPTION(name) \ +CORBA::Boolean operator>>= (const CORBA::Any &any, \ + const CORBA::name *&ex) \ +{ \ + return \ + TAO::Any_SystemException::extract ( \ + any, \ + CORBA::name ::_tao_any_destructor, \ + CORBA::_tc_ ## name, \ + (const CORBA::SystemException *&) ex, \ + &CORBA::name ::_tao_create); \ +} + +STANDARD_EXCEPTION_LIST +#undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h new file mode 100644 index 00000000000..eda4e0f4a8d --- /dev/null +++ b/TAO/tao/SystemException.h @@ -0,0 +1,257 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file SystemException.h + * + * $Id$ + * + * CORBA::SystemException class header. + * + * @author DOC Group at Vanderbilt U, Wash U, and UCI + * @author Ossama Othman <ossama@dre.vanderbilt.edu> + */ +//============================================================================= + +#ifndef TAO_SYSTEM_EXCEPTION_H +#define TAO_SYSTEM_EXCEPTION_H + +#include /**/ "ace/pre.h" + +// Do not try removing this. If you remove this for subsetting lots of +// things go wrong in TAO. +#include "tao/orbconf.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Exception.h" + + +class TAO_OutputCDR; +class TAO_InputCDR; + +#if defined (__Lynx__) + +// LynxOS uses macro THREAD_CANCELLED internally, so it must +// be undefined to avoid compilation errors +#if defined (THREAD_CANCELLED) +#undef THREAD_CANCELLED +#endif /* THREAD_CANCELLED */ + +#endif /*__Lynx__ */ + +// This is already done in orbconf.h. But this file is totally +// decoupled from its contents that we have to do this here. Including +// orbconf.h is probably going to be a overhead. +#if defined (minor) +#undef minor +#endif /* minor */ + +namespace CORBA +{ + class TypeCode; + typedef TypeCode *TypeCode_ptr; + + class Environment; + + class Any; + typedef Any *Any_ptr; + + /** + * @enum CompletionStatus + * + * @brief Completion status for CORBA system exceptions + * + * Enumerations that denote how an operation was (not) completed + * when a @c CORBA::SystemException is thrown. + */ + enum CompletionStatus + { + COMPLETED_YES, ///< Successful or exceptional completion. + COMPLETED_NO, ///< Didn't change any state; retry is OK. + COMPLETED_MAYBE ///< Can't say what happened; retry unsafe. + }; + + /** + * @class SystemException + * + * @brief SystemException + * + * System exceptions are those defined in the CORBA specification; + * OMG-IDL defines these. + */ + class TAO_Export SystemException : public Exception + { + public: + + /// Default constructor. + SystemException (void); + + /// Copy constructor. + SystemException (const SystemException & src); + + /// Destructor. + ~SystemException (void); + + /// Assignment operator. + SystemException &operator= (const SystemException &src); + + /// Get the minor status. + ULong minor (void) const; + + /// Set the minor status. + void minor (ULong m); + + /// Get the completion status. + CORBA::CompletionStatus completed (void) const; + + /// Set the operation completion status. + void completed (CORBA::CompletionStatus c); + + /// Narrow to a SystemException. + static SystemException *_downcast (CORBA::Exception *exception); + + /// The const version of narrow operation to a SystemException + static const SystemException *_downcast(const CORBA::Exception *exception); + + virtual void _raise (void) const = 0; + + // = TAO-specific extension. + + /// Helper for the _downcast operation. + virtual int _is_a (const char *type_id) const; + + /// Print the system exception @c ex to output determined by @c f. + /// This function is not CORBA compliant. + void _tao_print_system_exception (FILE *f = stdout) const; + + /// Create an exception from the available exception + /// virtual CORBA::Exception *_tao_duplicate (void) const; + + /// Returns a string containing information about the exception. This + /// function is not CORBA compliant. + virtual ACE_CString _info (void) const; + + virtual void _tao_encode (TAO_OutputCDR &cdr + ACE_ENV_ARG_DECL_NOT_USED) const; + virtual void _tao_decode (TAO_InputCDR &cdr + ACE_ENV_ARG_DECL_NOT_USED); + + /// Helper to create a minor status value. + static CORBA::ULong _tao_minor_code (u_int location, + int errno_value); + + /// Helper to translate a platform-specific errno to a TAO errno + /// value. + static CORBA::ULong _tao_errno (int errno_value); + + /// Overridden base class method to help compilers that use + /// explicit template instantiations going + virtual CORBA::Exception *_tao_duplicate (void) const {return 0;} + + protected: + + /// Constructor using a repository id. + SystemException (CORBA::ULong code, + CORBA::CompletionStatus completed); + + /// Constructor using a repository id. + SystemException (const char *repository_id, + const char *local_name, + CORBA::ULong code, + CORBA::CompletionStatus completed); + + /// Return the exception description associated with the given OMG + /// minor code. + static const char *_tao_get_omg_exception_description ( + const CORBA::SystemException &exc, + CORBA::ULong minor_code); + + private: + /// Minor code. + CORBA::ULong minor_; + + /// Completion status. + CORBA::CompletionStatus completed_; + + }; + + // Declarations for all of the CORBA standard exceptions. + // + // @@ - shouldn't have a default minor code, at least for code that's + // inside the ORB. All minor codes should be symbolically catalogued. + +#define TAO_SYSTEM_EXCEPTION(name) \ + class TAO_Export name : public SystemException \ + { \ + public: \ + name (void); \ + name (CORBA::ULong code, \ + CORBA::CompletionStatus completed); \ + static name * _downcast (CORBA::Exception* exception); \ + virtual void _raise (void) const; \ + virtual CORBA::TypeCode_ptr _type (void) const; \ + static void _tao_any_destructor (void*); \ + virtual CORBA::Exception *_tao_duplicate (void) const; \ + static CORBA::SystemException *_tao_create (void); \ + }; \ + TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \ + TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \ + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \ + const CORBA::name *&) + + TAO_SYSTEM_EXCEPTION(UNKNOWN); // the unknown exception + TAO_SYSTEM_EXCEPTION(BAD_PARAM); // an invalid parameter was passed + TAO_SYSTEM_EXCEPTION(NO_MEMORY); // memory allocation failure + TAO_SYSTEM_EXCEPTION(IMP_LIMIT); // violated implementation limit + TAO_SYSTEM_EXCEPTION(COMM_FAILURE); // communication failure + TAO_SYSTEM_EXCEPTION(INV_OBJREF); // invalid object reference + TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); // no such object + TAO_SYSTEM_EXCEPTION(NO_PERMISSION); // no permission for operation + TAO_SYSTEM_EXCEPTION(INTERNAL); // ORB internal error + TAO_SYSTEM_EXCEPTION(MARSHAL); // error marshaling param/result + TAO_SYSTEM_EXCEPTION(INITIALIZE); // ORB initialization failure + TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); // implementation unavailable + TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); // bad typecode + TAO_SYSTEM_EXCEPTION(BAD_OPERATION); // invalid operation + TAO_SYSTEM_EXCEPTION(NO_RESOURCES); // out of resources for request + TAO_SYSTEM_EXCEPTION(NO_RESPONSE); // response not yet available + TAO_SYSTEM_EXCEPTION(PERSIST_STORE); // persistent storage failure + TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); // routine invocations out of order + TAO_SYSTEM_EXCEPTION(TRANSIENT); // transient error, try again later + TAO_SYSTEM_EXCEPTION(FREE_MEM); // cannot free memory + TAO_SYSTEM_EXCEPTION(INV_IDENT); // invalid identifier syntax + TAO_SYSTEM_EXCEPTION(INV_FLAG); // invalid flag was specified + TAO_SYSTEM_EXCEPTION(INTF_REPOS); // interface repository unavailable + TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); // error processing context object + TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); // object adapter failure + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); // data conversion error + TAO_SYSTEM_EXCEPTION(INV_POLICY); // invalid policies present + TAO_SYSTEM_EXCEPTION(REBIND); // rebind needed + TAO_SYSTEM_EXCEPTION(TIMEOUT); // operation timed out + TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); // no transaction + TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); // invalid transaction mode + TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); // operation needs transaction + TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); // operation was a no-op + TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); // invalid TP context passed + TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); // incompatible code set + TAO_SYSTEM_EXCEPTION(BAD_QOS); // bad quality of service + TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); + TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); + TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); + TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED); + +#undef TAO_SYSTEM_EXCEPTION + +} // End CORBA namespace + + +#if defined (__ACE_INLINE__) +# include "tao/SystemException.inl" +#endif /* __ACE_INLINE__ */ + +#include /**/"ace/post.h" + +#endif /* TAO_SYSTEM_EXCEPTION_H */ diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl new file mode 100644 index 00000000000..46d29f41781 --- /dev/null +++ b/TAO/tao/SystemException.inl @@ -0,0 +1,27 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE CORBA::ULong +CORBA::SystemException::minor (void) const +{ + return this->minor_; +} + +ACE_INLINE void +CORBA::SystemException::minor (CORBA::ULong m) +{ + this->minor_ = m; +} + +ACE_INLINE CORBA::CompletionStatus +CORBA::SystemException::completed (void) const +{ + return this->completed_; +} + +ACE_INLINE void +CORBA::SystemException::completed (CORBA::CompletionStatus c) +{ + this->completed_ = c; +} diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 7dc1757e108..317c0fafc71 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -51,10 +51,10 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void TAO::BufferingConstraint::_tao_any_destructor ( void *_tao_void_pointer ) @@ -71,7 +71,7 @@ TAO::BufferingConstraint::_tao_any_destructor ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_duplicate ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::duplicate ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -80,7 +80,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_duplicate ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_release ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::release ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -89,14 +89,14 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_release ( ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_nil (void) +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::nil (void) { return TAO::BufferingConstraintPolicy::_nil (); } ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean -TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_marshal ( +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::marshal ( TAO::BufferingConstraintPolicy_ptr p, TAO_OutputCDR & cdr ) @@ -105,7 +105,7 @@ TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*TAO__TAO_BufferingConstraintPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -116,7 +116,7 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) {} -void +void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer) { BufferingConstraintPolicy *_tao_tmp_pointer = @@ -134,10 +134,10 @@ TAO::BufferingConstraintPolicy::_narrow ( { return BufferingConstraintPolicy::_nil (); } - + BufferingConstraintPolicy_ptr proxy = dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref); - + return BufferingConstraintPolicy::_duplicate (proxy); } @@ -151,10 +151,10 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow ( { return BufferingConstraintPolicy::_nil (); } - + BufferingConstraintPolicy_ptr proxy = dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref); - + return BufferingConstraintPolicy::_duplicate (proxy); } @@ -165,7 +165,7 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -264,7 +264,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< TAO::BufferingConstraintPolicy >; - + template class TAO_Objref_Out_T< TAO::BufferingConstraintPolicy @@ -291,11 +291,10 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ TAO::BufferingConstraintPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ TAO::BufferingConstraintPolicy > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 392e48e7301..8b6258bfd93 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -71,13 +71,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template<typename T> class Narrow_Utils; template<typename T> class AbstractBase_Narrow_Utils; } @@ -87,92 +87,92 @@ namespace TAO namespace TAO { - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct BufferingConstraint; - + typedef TAO_Fixed_Var_T< BufferingConstraint > BufferingConstraint_var; - + typedef BufferingConstraint & BufferingConstraint_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export BufferingConstraint { typedef BufferingConstraint_var _var_type; - + static void _tao_any_destructor (void *); TAO::BufferingConstraintMode mode; TimeBase::TimeT timeout; CORBA::ULong message_count; CORBA::ULong message_bytes; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; - + // TAO_IDL - Generated from // be\be_interface.cpp:611 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_ - + class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; - + typedef TAO_Objref_Var_T< BufferingConstraintPolicy > BufferingConstraintPolicy_var; - + typedef TAO_Objref_Out_T< BufferingConstraintPolicy @@ -180,109 +180,109 @@ namespace TAO BufferingConstraintPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ - + class TAO_Export BufferingConstraintPolicy : public virtual CORBA::Policy { public: typedef BufferingConstraintPolicy_ptr _ptr_type; typedef BufferingConstraintPolicy_var _var_type; - + // The static operations. static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); - + static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BufferingConstraintPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static BufferingConstraintPolicy_ptr _nil (void) { return (BufferingConstraintPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::TAO::BufferingConstraint buffering_constraint ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. BufferingConstraintPolicy (void); - + virtual ~BufferingConstraintPolicy (void); - + private: // Private and unimplemented for concrete interfaces. BufferingConstraintPolicy (const BufferingConstraintPolicy &); - + void operator= (const BufferingConstraintPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2; // TAO_IDL - Generated from @@ -299,18 +299,18 @@ namespace TAO #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<TAO::BufferingConstraintPolicy> { - static TAO::BufferingConstraintPolicy_ptr tao_duplicate ( + static TAO::BufferingConstraintPolicy_ptr duplicate ( TAO::BufferingConstraintPolicy_ptr ); - static void tao_release ( + static void release ( TAO::BufferingConstraintPolicy_ptr ); - static TAO::BufferingConstraintPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( + static TAO::BufferingConstraintPolicy_ptr nil (void); + static CORBA::Boolean marshal ( TAO::BufferingConstraintPolicy_ptr p, TAO_OutputCDR & cdr ); @@ -358,4 +358,3 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #include /**/ "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index a6ca1816226..879a332ccfc 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -8,6 +8,7 @@ #include "GIOP_Utils.h" #include "Transport.h" #include "CDR.h" +#include "SystemException.h" #if !defined (__ACE_INLINE__) # include "TAO_Server_Request.i" diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp index ed85271751c..1ca22a258e7 100644 --- a/TAO/tao/Thread_Lane_Resources.cpp +++ b/TAO/tao/Thread_Lane_Resources.cpp @@ -12,6 +12,7 @@ ACE_RCSID (tao, #include "tao/Connection_Handler.h" #include "tao/Transport.h" #include "tao/Connector_Registry.h" +#include "tao/SystemException.h" #include "ace/Reactor.h" diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index eddbc58c5cb..7ef578dfd72 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -11,6 +11,7 @@ #include "Connection_Handler.h" #include "Profile_Transport_Resolver.h" #include "Wait_Strategy.h" +#include "SystemException.h" #include "ace/OS_NS_string.h" @@ -53,7 +54,7 @@ TAO_Connector::make_mprofile (const char *string, { ACE_THROW_RETURN (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + 0, EINVAL), CORBA::COMPLETED_NO), -1); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index d110f439219..8c73fb1528d 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Constants.h" #include "tao/CDR.h" #include "tao/Any_Impl.h" +#include "tao/SystemException.h" #include "ace/Containers_T.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 649caf3267b..f7732120b18 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Exception.h" +#include "tao/SystemException.h" #include "tao/OBV_Constants.h" #include "tao/default_environment.h" diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index b9e3e261989..c68f7847c90 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -20,6 +20,7 @@ #include "debug.h" #include "Any_Unknown_IDL_Type.h" #include "ORB_Constants.h" +#include "SystemException.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -3641,7 +3642,7 @@ CORBA::Any_ptr CORBA::TypeCode::parameter (const CORBA::Long /* slot */ ACE_ENV_ARG_DECL) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (0, CORBA::COMPLETED_NO), 0); } @@ -3651,26 +3652,26 @@ CORBA::TypeCode::parameter (const CORBA::Long /* slot */ namespace TAO { CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::tao_duplicate (CORBA::TypeCode_ptr p) + Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p) { return CORBA::TypeCode::_duplicate (p); } void - Objref_Traits<CORBA::TypeCode>::tao_release (CORBA::TypeCode_ptr p) + Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p) { CORBA::release (p); } CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::tao_nil (void) + Objref_Traits<CORBA::TypeCode>::nil (void) { return CORBA::TypeCode::_nil (); } CORBA::Boolean - Objref_Traits<CORBA::TypeCode>::tao_marshal (CORBA::TypeCode_ptr p, - TAO_OutputCDR & cdr) + Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p, + TAO_OutputCDR & cdr) { return cdr << p; } @@ -3684,7 +3685,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x) if (x == 0) { ACE_DECLARE_NEW_CORBA_ENV; - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), 0); } diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 6020c59e98d..e0cd99ddbe6 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -27,7 +27,7 @@ #include "ace/Hash_Map_Manager_T.h" #include "ace/Unbounded_Queue.h" -#include "tao/Exception.h" +#include "tao/UserException.h" #include "tao/Environment.h" #include "tao/Pseudo_VarOut_T.h" #include "tao/Objref_VarOut_T.h" @@ -622,11 +622,11 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::TypeCode> { - static CORBA::TypeCode_ptr tao_duplicate (CORBA::TypeCode_ptr); - static void tao_release (CORBA::TypeCode_ptr); - static CORBA::TypeCode_ptr tao_nil (void); - static CORBA::Boolean tao_marshal (CORBA::TypeCode_ptr p, - TAO_OutputCDR & cdr); + static CORBA::TypeCode_ptr duplicate (CORBA::TypeCode_ptr); + static void release (CORBA::TypeCode_ptr); + static CORBA::TypeCode_ptr nil (void); + static CORBA::Boolean marshal (CORBA::TypeCode_ptr p, + TAO_OutputCDR & cdr); }; /** diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp index 34e87120ffa..d842c153221 100644 --- a/TAO/tao/Typecode_Constants.cpp +++ b/TAO/tao/Typecode_Constants.cpp @@ -29,8 +29,9 @@ #include "tao/Typecode_Constants.h" #include "tao/Typecode.h" #include "tao/NVList.h" -#include "ORB.h" +#include "tao/ORB.h" #include "tao/Object.h" +#include "tao/SystemException.h" #if defined (TAO_HAS_AMI_POLLER) && (TAO_HAS_AMI_POLLER == 1) #include "tao/PollableC.h" diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp new file mode 100644 index 00000000000..8b70d678d0b --- /dev/null +++ b/TAO/tao/UserException.cpp @@ -0,0 +1,75 @@ +// $Id$ + +#include "UserException.h" + +#include "ace/SString.h" + + +ACE_RCSID (tao, + UserException, + "$Id$") + + +CORBA::UserException::UserException (void) +{ +} + +CORBA::UserException::UserException (char const * repository_id, + char const * local_name) + : CORBA::Exception (repository_id, + local_name) +{ +} + +CORBA::UserException::~UserException (void) +{ +} + +CORBA::UserException & +CORBA::UserException::operator= (CORBA::UserException const & rhs) +{ + this->Exception::operator= (rhs); + return *this; +} + +int +CORBA::UserException::_is_a (char const * interface_id) const +{ + return ACE_OS::strcmp (interface_id, + "IDL:omg.org/CORBA/UserException:1.0") == 0 + || this->Exception::_is_a (interface_id); +} + +CORBA::UserException* +CORBA::UserException::_downcast (CORBA::Exception* exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) + { + return dynamic_cast<CORBA::UserException *> (exception); + } + + return 0; +} + +const CORBA::UserException* +CORBA::UserException::_downcast (CORBA::Exception const * exception) +{ + if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) + { + return dynamic_cast<const CORBA::UserException *> (exception); + } + + return 0; +} + +ACE_CString +CORBA::UserException::_info (void) const +{ + // @@ we can use the exception's typecode to dump all the data held + // within it ... + + ACE_CString user_exception_info = "user exception, ID '"; + user_exception_info += this->_rep_id (); + user_exception_info += "'"; + return user_exception_info; +} diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h new file mode 100644 index 00000000000..80b1c85ee1a --- /dev/null +++ b/TAO/tao/UserException.h @@ -0,0 +1,88 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file UserException.h + * + * $Id$ + * + * CORBA::UserException class header. + * + * @author DOC Group at Vanderbilt U, Wash U, and UCI + * @author Ossama Othman <ossama@dre.vanderbilt.edu> + */ +//============================================================================= + +#ifndef TAO_USER_EXCEPTION_H +#define TAO_USER_EXCEPTION_H + +#include /**/ "ace/pre.h" + +#include "tao/Exception.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + +namespace CORBA +{ + /** + * @class UserException + * + * @brief Application- or OMG- defined CORBA exception sub-class. + * + * User exceptions can be defined in application OMG IDL or by the + * OMG itself for IDL interfaces and services it defines. + */ + class TAO_Export UserException : public Exception + { + public: + + /// Copy constructor. + UserException (UserException const & rhs); + + /// Destructor. + ~UserException (void); + + /// Assignment operator. + UserException & operator= (UserException const & rhs); + + /// The narrow operation. + static UserException * _downcast (CORBA::Exception * exception); + + /// The const version of narrow operation + static const UserException * _downcast ( + CORBA::Exception const * exception); + + virtual void _raise (void) const = 0; + + // = TAO specific extension. + + /// Constructor from a repository id. + UserException (char const * repository_id, + char const * local_name); + + virtual int _is_a (char const * interface_id) const; + + // Used for narrowing + + /// Returns a string containing information about the exception. This + /// function is not CORBA compliant. + virtual ACE_CString _info (void) const; + + //protected: + /// Default constructor. + UserException (void); + + }; + +} + +#if defined (__ACE_INLINE__) +# include "tao/UserException.inl" +#endif /* __ACE_INLINE__ */ + +#include /**/"ace/post.h" + +#endif /* TAO_USER_EXCEPTION_H */ diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl new file mode 100644 index 00000000000..509094f5757 --- /dev/null +++ b/TAO/tao/UserException.inl @@ -0,0 +1,9 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_INLINE +CORBA::UserException::UserException (CORBA::UserException const & rhs) + : CORBA::Exception (rhs) +{ +} diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp index 4d518d638e7..08f1571b21e 100644 --- a/TAO/tao/Valuetype/Sequence_T.cpp +++ b/TAO/tao/Valuetype/Sequence_T.cpp @@ -9,15 +9,15 @@ #include "Sequence_T.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Valuetype, - Sequence_T, +ACE_RCSID (Valuetype, + Sequence_T, "$Id$") // ************************************************************* // class TAO_Valuetype_Manager // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= ( const TAO_Valuetype_Manager<T,T_var> & rhs @@ -30,9 +30,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= ( if (this->release_) { - TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); + TAO::Value_Traits<T>::remove_ref (*this->ptr_); *this->ptr_ = *rhs.ptr_; - TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); + TAO::Value_Traits<T>::add_ref (*this->ptr_); } else { @@ -42,7 +42,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= ( return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= (T * p) { @@ -52,7 +52,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p) // that of a var variable. Therefore we will not duplicate the // user provided pointer before assigning it to the internal // variable. - TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); + TAO::Value_Traits<T>::remove_ref (*this->ptr_); *this->ptr_ = p; } else @@ -63,7 +63,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (T * p) return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Valuetype_Manager<T,T_var> & TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) { @@ -78,9 +78,9 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) (*this->ptr_)->_remove_ref (); } - TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); + TAO::Value_Traits<T>::remove_ref (*this->ptr_); *this->ptr_ = p.in (); - TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); + TAO::Value_Traits<T>::add_ref (*this->ptr_); } else { @@ -94,7 +94,7 @@ TAO_Valuetype_Manager<T,T_var>::operator= (const T_var & p) // Operations for class TAO_Unbounded_Valuetype_Sequence // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( CORBA::ULong maximum ) @@ -105,7 +105,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs ) @@ -118,12 +118,11 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( this->maximum_ ); T ** const tmp2 = - ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); + TAO::Value_Traits<T>::add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -135,7 +134,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( } } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence ( void ) @@ -143,7 +142,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::~TAO_Unbounded_Valuetype_Sequence ( this->_deallocate_buffer (); } -template <typename T, typename T_var> +template <typename T, typename T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var> & TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( const TAO_Unbounded_Valuetype_Sequence<T,T_var> & rhs @@ -156,12 +155,11 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( if (this->release_) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); + TAO::Value_Traits<T>::remove_ref (tmp[i]); tmp[i] = 0; } @@ -189,27 +187,25 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator= ( TAO_Unbounded_Base_Sequence::operator= (rhs); - T ** tmp1 = ACE_reinterpret_cast (T **, - this->buffer_); - T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + T ** tmp1 = reinterpret_cast<T **> (this->buffer_); + T ** const tmp2 = reinterpret_cast<T **ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); + TAO::Value_Traits<T>::add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } return *this; } -template <typename T, typename T_var> +template <typename T, typename T_var> T ** TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems) { T ** buf = 0; - ACE_NEW_RETURN (buf, - T * [nelems], + ACE_NEW_RETURN (buf, + T * [nelems], 0); for (CORBA::ULong i = 0; i < nelems; ++i) @@ -220,7 +216,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems) return buf; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer) { @@ -244,19 +240,18 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::freebuf (T ** buffer) delete [] buffer; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( CORBA::ULong length ) { - T ** tmp = + T ** tmp = TAO_Unbounded_Valuetype_Sequence<T,T_var>::allocbuf (length); if (this->buffer_ != 0) { - T ** old = ACE_reinterpret_cast (T **, - this->buffer_); + T ** old = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) // Only call duplicate when we did not own the previous @@ -266,7 +261,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( // the old instances. if (!this->release_) { - TAO::Value_Traits<T>::tao_add_ref (tmp[i]); + TAO::Value_Traits<T>::add_ref (tmp[i]); tmp[i] = old[i]; } else @@ -283,7 +278,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_allocate_buffer ( this->buffer_ = tmp; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) { @@ -292,12 +287,11 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) return; } - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); + TAO::Value_Traits<T>::remove_ref (tmp[i]); tmp[i] = 0; } @@ -305,19 +299,18 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::_deallocate_buffer (void) this->buffer_ = 0; } -template <typename T, typename T_var> +template <typename T, typename T_var> void TAO_Unbounded_Valuetype_Sequence<T,T_var>::_shrink_buffer ( CORBA::ULong nl, CORBA::ULong ol ) { - T ** tmp = ACE_static_cast (T **, - this->buffer_); + T ** tmp = static_cast<T **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); + TAO::Value_Traits<T>::remove_ref (tmp[i]); tmp[i] = 0; } } @@ -349,11 +342,11 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (MAX); T ** const tmp2 = - ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_); + reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); + TAO::Value_Traits<T>::add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -378,12 +371,11 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= ( if (this->release_) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { - TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); + TAO::Value_Traits<T>::remove_ref (tmp[i]); tmp[i] = 0; } // No need to reallocate the buffer since it is always of size @@ -406,14 +398,12 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - T ** tmp1 = ACE_reinterpret_cast (T **, - this->buffer_); - T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + T ** tmp1 = reinterpret_cast<T **> (this->buffer_); + T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { - TAO::Value_Traits<T>::tao_add_ref (tmp2[i]); + TAO::Value_Traits<T>::add_ref (tmp2[i]); tmp1[i] = tmp2[i]; } @@ -425,8 +415,8 @@ T ** TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::allocbuf (CORBA::ULong) { T ** buf = 0; - ACE_NEW_RETURN (buf, - T * [MAX], + ACE_NEW_RETURN (buf, + T * [MAX], 0); for (CORBA::ULong i = 0; i < MAX; ++i) @@ -448,7 +438,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (T ** buffer) { if (buffer[i] != 0) { - TAO::Value_Traits<T>::tao_remove_ref (buffer[i]); + TAO::Value_Traits<T>::remove_ref (buffer[i]); buffer[i] = 0; } } @@ -477,8 +467,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_deallocate_buffer (void) return; } - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::freebuf (tmp); this->buffer_ = 0; } @@ -490,12 +479,11 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer ( CORBA::ULong ol ) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { - TAO::Value_Traits<T>::tao_remove_ref (tmp[i]); + TAO::Value_Traits<T>::remove_ref (tmp[i]); tmp[i] = 0; } } diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl index 98776b01bb5..3468c13718a 100644 --- a/TAO/tao/Valuetype/Sequence_T.inl +++ b/TAO/tao/Valuetype/Sequence_T.inl @@ -7,13 +7,13 @@ // Inline operations for class TAO_Valuetype_Manager // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::~TAO_Valuetype_Manager (void) { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager ( const TAO_Valuetype_Manager<T,T_var> & rhs @@ -23,10 +23,10 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager( - T ** buffer, + T ** buffer, CORBA::Boolean release ) : ptr_ (buffer), @@ -34,64 +34,64 @@ TAO_Valuetype_Manager<T,T_var>::TAO_Valuetype_Manager( { } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::operator-> (void) const { return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator const T_var () const { - TAO::Value_Traits<T>::tao_add_ref (*this->ptr_); + TAO::Value_Traits<T>::add_ref (*this->ptr_); return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator const T * () const { return *this->ptr_; } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Valuetype_Manager<T,T_var>::operator T *& () { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::in (void) const { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T *& TAO_Valuetype_Manager<T,T_var>::inout (void) { return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T *& TAO_Valuetype_Manager<T,T_var>::out (void) { - TAO::Value_Traits<T>::tao_remove_ref (*this->ptr_); + TAO::Value_Traits<T>::remove_ref (*this->ptr_); *this->ptr_ = 0; return *this->ptr_; } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE T * TAO_Valuetype_Manager<T,T_var>::_retn (void) { @@ -104,7 +104,7 @@ TAO_Valuetype_Manager<T,T_var>::_retn (void) // class TAO_Unbounded_Valuetype_Sequence // ************************************************************* -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( void @@ -112,7 +112,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> +template <typename T, typename T_var> ACE_INLINE TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( CORBA::ULong maximum, @@ -124,8 +124,8 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::TAO_Unbounded_Valuetype_Sequence ( { } -template <typename T, typename T_var> -ACE_INLINE +template <typename T, typename T_var> +ACE_INLINE TAO_Valuetype_Manager<T,T_var> TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] ( CORBA::ULong slot @@ -140,7 +140,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] ( // class TAO_Bounded_Valuetype_Sequence // ************************************************************* -template<typename T, typename T_var, size_t MAX> +template<typename T, typename T_var, size_t MAX> ACE_INLINE TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence ( void @@ -149,7 +149,7 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::~TAO_Bounded_Valuetype_Sequence ( this->_deallocate_buffer (); } -template<typename T, typename T_var, size_t MAX> +template<typename T, typename T_var, size_t MAX> ACE_INLINE TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( CORBA::ULong length, @@ -160,8 +160,8 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::TAO_Bounded_Valuetype_Sequence ( { } -template<typename T, typename T_var, size_t MAX> -ACE_INLINE +template<typename T, typename T_var, size_t MAX> +ACE_INLINE TAO_Valuetype_Manager<T,T_var> TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( CORBA::ULong slot @@ -171,4 +171,3 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_); return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_); } - diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 2a740b7b815..eb0524252fe 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -517,21 +517,21 @@ operator>> (TAO_InputCDR &strm, namespace TAO { void - Value_Traits<CORBA::ValueBase>::tao_add_ref ( + Value_Traits<CORBA::ValueBase>::add_ref ( CORBA::ValueBase *p) { CORBA::add_ref (p); } void - Value_Traits<CORBA::ValueBase>::tao_remove_ref ( + Value_Traits<CORBA::ValueBase>::remove_ref ( CORBA::ValueBase * p) { CORBA::remove_ref (p); } void - Value_Traits<CORBA::ValueBase>::tao_release ( + Value_Traits<CORBA::ValueBase>::release ( CORBA::ValueBase * p) { CORBA::remove_ref (p); diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index d75f136558d..ff35debdefc 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -224,12 +224,12 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase> { - static void tao_add_ref (CORBA::ValueBase *); - static void tao_remove_ref (CORBA::ValueBase *); + static void add_ref (CORBA::ValueBase *); + static void remove_ref (CORBA::ValueBase *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void tao_release (CORBA::ValueBase *); + static void release (CORBA::ValueBase *); }; } diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index df331883ffe..cf0f39e5e55 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -83,19 +83,19 @@ namespace TAO using namespace CORBA; void - Value_Traits<ValueFactoryBase>::tao_add_ref (ValueFactoryBase *p) + Value_Traits<ValueFactoryBase>::add_ref (ValueFactoryBase *p) { CORBA::add_ref (p); } void - Value_Traits<ValueFactoryBase>::tao_remove_ref (ValueFactoryBase * p) + Value_Traits<ValueFactoryBase>::remove_ref (ValueFactoryBase * p) { CORBA::remove_ref (p); } void - Value_Traits<ValueFactoryBase>::tao_release (ValueFactoryBase * p) + Value_Traits<ValueFactoryBase>::release (ValueFactoryBase * p) { CORBA::remove_ref (p); } diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index af8fbe0d5d7..68c209c634d 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -84,15 +84,12 @@ namespace TAO ACE_TEMPLATE_SPECIALIZATION struct TAO_Valuetype_Export Value_Traits<CORBA::ValueFactoryBase> { - static void tao_add_ref ( - CORBA::ValueFactoryBase *); - static void tao_remove_ref ( - CORBA::ValueFactoryBase *); + static void add_ref (CORBA::ValueFactoryBase *); + static void remove_ref (CORBA::ValueFactoryBase *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void tao_release ( - CORBA::ValueFactoryBase *); + static void release (CORBA::ValueFactoryBase *); }; } // Use this macro for writing code that is independend from diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index ddcfe18c1f3..a235bf8fee3 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -14,21 +14,21 @@ ACE_RCSID (Valuetype, template<typename T> void -TAO::Value_Traits<T>::tao_add_ref (T * p) +TAO::Value_Traits<T>::add_ref (T * p) { CORBA::add_ref (p); } template<typename T> void -TAO::Value_Traits<T>::tao_remove_ref (T * p) +TAO::Value_Traits<T>::remove_ref (T * p) { CORBA::remove_ref (p); } template<typename T> void -TAO::Value_Traits<T>::tao_release (T * p) +TAO::Value_Traits<T>::release (T * p) { CORBA::remove_ref (p); } @@ -47,7 +47,7 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T (T * p) template <typename T> TAO_Value_Var_T<T>::TAO_Value_Var_T (const T * p) - : ptr_ (ACE_const_cast (T *, p)) + : ptr_ (const_cast<T *> (p)) {} template <typename T> @@ -62,21 +62,21 @@ TAO_Value_Var_T<T>::TAO_Value_Var_T ( const TAO_Value_Var_T<T> & p ) { - TAO::Value_Traits<T>::tao_add_ref (p.ptr ()); + TAO::Value_Traits<T>::add_ref (p.ptr ()); this->ptr_ = p.ptr (); } template <typename T> TAO_Value_Var_T<T>::~TAO_Value_Var_T (void) { - TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); + TAO::Value_Traits<T>::remove_ref (this->ptr_); } template <typename T> TAO_Value_Var_T<T> & TAO_Value_Var_T<T>::operator= (T * p) { - TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); + TAO::Value_Traits<T>::remove_ref (this->ptr_); this->ptr_ = p; return *this; } @@ -87,9 +87,9 @@ TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p) { if (this != &p) { - TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); + TAO::Value_Traits<T>::remove_ref (this->ptr_); T * tmp = p.ptr (); - TAO::Value_Traits<T>::tao_add_ref (tmp); + TAO::Value_Traits<T>::add_ref (tmp); this->ptr_ = tmp; } @@ -133,7 +133,7 @@ template <typename T> T *& TAO_Value_Var_T<T>::out (void) { - TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); + TAO::Value_Traits<T>::remove_ref (this->ptr_); this->ptr_ = 0; return this->ptr_; } @@ -160,7 +160,7 @@ template <typename T> TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p) : ptr_ (p.out ()) { - TAO::Value_Traits<T>::tao_remove_ref (this->ptr_); + TAO::Value_Traits<T>::remove_ref (this->ptr_); this->ptr_ = 0; } @@ -182,7 +182,7 @@ TAO_Value_Out_T<T> & TAO_Value_Out_T<T>::operator= (const TAO_Value_Var_T<T> & p) { T * tmp = p.ptr (); - TAO::Value_Traits<T>::tao_add_ref (tmp); + TAO::Value_Traits<T>::add_ref (tmp); this->ptr_ = tmp; return *this; } diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index d6e94700362..25e2af286dd 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -30,12 +30,12 @@ namespace TAO template<typename T> struct Value_Traits { - static void tao_add_ref (T *); - static void tao_remove_ref (T *); + static void add_ref (T *); + static void remove_ref (T *); // For INOUT value type arguments, so they can use the same set // of arg classes as interfaces. - static void tao_release (T *); + static void release (T *); }; } diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index 5f358938220..591995eb163 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -86,7 +86,7 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal ( { typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; ACE_ALLOCATOR_RETURN (this->x_, - ARRAY_TRAITS::tao_alloc (), + ARRAY_TRAITS::alloc (), 0); S_forany tmp (this->x_); return cdr >> tmp; @@ -125,7 +125,7 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal ( typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; S_slice * tmp_ptr = 0; ACE_ALLOCATOR_RETURN (tmp_ptr, - ARRAY_TRAITS::tao_alloc (), + ARRAY_TRAITS::alloc (), 0); this->x_ = tmp_ptr; S_forany tmp (this->x_.ptr ()); diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp index 2357c5fc611..acec61525a9 100644 --- a/TAO/tao/WrongTransactionA.cpp +++ b/TAO/tao/WrongTransactionA.cpp @@ -27,6 +27,7 @@ #include "WrongTransactionC.h" #include "tao/Typecode.h" +#include "tao/SystemException.h" #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from @@ -171,4 +172,3 @@ CORBA::Boolean operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 3196a475d79..d6b3f067135 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -32,6 +32,7 @@ #include "WrongTransactionC.h" #include "tao/CDR.h" #include "tao/Typecode.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -197,4 +198,3 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 609ad113229..3111bc36f50 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -27,6 +27,8 @@ #include "tao/Marshal.h" #include "tao/Any_Impl.h" #include "tao/CDR.h" +#include "tao/SystemException.h" + #include "ace/Dynamic_Service.h" ACE_RCSID (tao, @@ -97,7 +99,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -112,12 +114,12 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, CORBA::TypeCode_var elem_tc; if (!(*src >> elem_tc.inout ())) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); if (!(*dest << elem_tc.in ())) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); @@ -135,7 +137,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Any::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -256,7 +258,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); } - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -342,7 +344,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -385,7 +387,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -676,7 +678,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1120,7 +1122,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1174,7 +1176,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1204,7 +1206,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1310,7 +1312,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::append detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index f38e43d31b7..822d5499ad2 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -37,7 +37,8 @@ #include "tao/Typecode.h" #include "tao/Environment.h" -#include "tao/Exception.h" +#include "tao/SystemException.h" +#include "tao/UserException.h" #include "tao/NVList.h" diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 984a957db88..d8d2e27a3e3 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -5,16 +5,21 @@ #include "ORB_Constants.h" #include "DynamicC.h" #include "Exception_Data.h" +#include "SystemException.h" + #include "ace/OS_NS_string.h" + #if !defined (__ACE_INLINE__) # include "tao/operation_details.i" #endif /* ! __ACE_INLINE__ */ + ACE_RCSID (tao, operation_details, "$Id$") + CORBA::Exception * TAO_Operation_Details::corba_exception (const char *id ACE_ENV_ARG_DECL) @@ -34,7 +39,7 @@ TAO_Operation_Details::corba_exception (const char *id if (exception == 0) { - ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::NO_MEMORY (0, CORBA::COMPLETED_YES), 0); } @@ -44,7 +49,7 @@ TAO_Operation_Details::corba_exception (const char *id } // If there are no matches return an unknown exception. - ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::UNKNOWN (0, CORBA::COMPLETED_YES), 0); } @@ -121,4 +126,3 @@ TAO_Operation_Details::result (CORBA::Any *any) } #endif /* TAO_HAS_INTERCEPTORS == 1 */ - diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 0002eed3f1d..5950a8b3235 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "Exception.h" +#include "SystemException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 00e613ea836..15108839291 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -26,6 +26,8 @@ #include "Typecode.h" #include "Any_Impl.h" #include "tao/CDR.h" +#include "SystemException.h" + #include "ace/Dynamic_Service.h" ACE_RCSID (tao, @@ -89,7 +91,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, LM_DEBUG, ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -207,7 +209,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -238,7 +240,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -301,7 +303,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, LM_DEBUG, ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n") )); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -340,7 +342,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -618,7 +620,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -855,7 +857,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -905,7 +907,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Except::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -936,7 +938,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_WString::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } @@ -1033,7 +1035,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_Value::skip detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW_RETURN (CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 44b4d265263..66906d8b16f 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -77,6 +77,8 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co CurrentC.cpp CurrentA.cpp Exception.cpp + SystemException.cpp + UserException.cpp WrongTransactionC.cpp WrongTransactionA.cpp Environment.cpp |