diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-13 22:35:50 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-13 22:35:50 +0000 |
| commit | 52720b2bf85002c458930633e394149af63186c9 (patch) | |
| tree | d861a946114ad1614967bb758614c8abfab6ea19 | |
| parent | 8fc9cdb820d0fe4922dec4ba6f1f956bc0f12795 (diff) | |
| download | ATCD-52720b2bf85002c458930633e394149af63186c9.tar.gz | |
ChangeLogTag:Mon Mar 13 14:19:27 2000 Carlos O'Ryan <coryan@uci.edu>
30 files changed, 1106 insertions, 2351 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 471edbba8cd..20bb17c2e8c 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,63 @@ +Mon Mar 13 14:19:27 2000 Carlos O'Ryan <coryan@uci.edu> + + * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: + There are two versions of the >>= operators: + + CORBA::Boolean >>= (const Any&, T*&) + CORBA::Boolean >>= (const Any&, const T*&) + + the first one is deprecated, but we still support it. Jeff + Parsons pointed out that the first version can be implemented + using the second version as follows: + return any >>= ACE_const_cast(const T*&,x); + i also simplified the implementation of the second version. + + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_structure/structure_cs.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + Had to revert Jeff fix for the _tao_any_destructor functions + declared in deeply nested modules. GCC gets utterly confused by + this declaration + void ::Foo::Bar::_tao_any_destructor (void *) .... + + * tao/Makefile: + * tao/deep_free.cpp: + * tao/Marshal.h: + * tao/Marshal.i: + Removed (finally!) the deep_free methods. Now we only need to + remove the support classes to finally get rid of all the + interpretive marshaling code. + + * tao/GIOPC.cpp: + * tao/IOPC.cpp: + * tao/ImplRepoC.h: + * tao/ImplRepoC.i: + * tao/ImplRepoC.cpp: + * tao/ImplRepoS.h: + * tao/ImplRepoS.i: + * tao/ImplRepoS.cpp: + * tao/ImplRepoS_T.h: + * tao/ImplRepoS_T.i: + * tao/ImplRepoS_T.cpp: + * tao/InterceptorC.cpp: + * tao/POAC.cpp: + * tao/PolicyC.cpp: + * tao/TAOC.cpp: + Fix the hand-crafted files with respect to the two versions of + the >>= operators. + + * TAO_IDL/Makefile: + Updated dependencies + + * TAO_IDL/be/be_visitor_factory.cpp: + Cosmetic fixes. + Mon Mar 13 08:23:23 2000 Carlos O'Ryan <coryan@uci.edu> * tao/Any.h: diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index ced52e8adf0..5f00e9f18a5 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -10336,19 +10336,13 @@ tags: be_include/be_interface_strategy.h be_include/be_visitor_argument.h \ be_include/be_visitor_argument/argument.h \ be_include/be_visitor_argument/arglist.h \ - be_include/be_visitor_argument/pre_docall_cs.h \ - be_include/be_visitor_argument/docall_cs.h \ - be_include/be_visitor_argument/post_docall_cs.h \ - be_include/be_visitor_argument/post_docall_compiled_cs.h \ be_include/be_visitor_argument/vardecl_ss.h \ - be_include/be_visitor_argument/pre_upcall_ss.h \ be_include/be_visitor_argument/upcall_ss.h \ be_include/be_visitor_argument/post_upcall_ss.h \ be_include/be_visitor_argument/marshal_ss.h \ - be_include/be_visitor_argument/post_marshal_ss.h \ - be_include/be_visitor_argument/compiled_marshal_cs.h \ - be_include/be_visitor_argument/compiled_marshal_ss.h \ be_include/be_visitor_argument/pre_invoke_cs.h \ + be_include/be_visitor_argument/invoke_cs.h \ + be_include/be_visitor_argument/post_invoke_cs.h \ be_include/be_visitor_array.h be_include/be_visitor_array/array.h \ be_include/be_visitor_array/array_ch.h \ be_include/be_visitor_array/array_ci.h \ @@ -10462,9 +10456,7 @@ tags: be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ be_include/be_visitor_operation/rettype_vardecl_cs.h \ - be_include/be_visitor_operation/rettype_pre_docall_cs.h \ - be_include/be_visitor_operation/rettype_docall_cs.h \ - be_include/be_visitor_operation/rettype_post_docall_cs.h \ + be_include/be_visitor_operation/rettype_post_invoke_cs.h \ be_include/be_visitor_operation/rettype_return_cs.h \ be_include/be_visitor_operation/exceptlist_cs.h \ be_include/be_visitor_operation/argument.h \ @@ -10474,7 +10466,6 @@ tags: be_include/be_visitor_operation/rettype_assign_ss.h \ be_include/be_visitor_operation/rettype_post_upcall_ss.h \ be_include/be_visitor_operation/rettype_marshal_ss.h \ - be_include/be_visitor_operation/compiled_marshal.h \ be_include/be_visitor_operation/rettype_pre_invoke_cs.h \ be_include/be_visitor_operation/ami_ch.h \ be_include/be_visitor_operation/ami_cs.h \ @@ -10891,34 +10882,22 @@ tags: be_include/be_visitor_argument.h \ be_include/be_visitor_argument/argument.h \ be_include/be_visitor_argument/arglist.h \ - be_include/be_visitor_argument/pre_docall_cs.h \ - be_include/be_visitor_argument/docall_cs.h \ - be_include/be_visitor_argument/post_docall_cs.h \ - be_include/be_visitor_argument/post_docall_compiled_cs.h \ be_include/be_visitor_argument/vardecl_ss.h \ - be_include/be_visitor_argument/pre_upcall_ss.h \ be_include/be_visitor_argument/upcall_ss.h \ be_include/be_visitor_argument/post_upcall_ss.h \ be_include/be_visitor_argument/marshal_ss.h \ - be_include/be_visitor_argument/post_marshal_ss.h \ - be_include/be_visitor_argument/compiled_marshal_cs.h \ - be_include/be_visitor_argument/compiled_marshal_ss.h \ be_include/be_visitor_argument/pre_invoke_cs.h \ + be_include/be_visitor_argument/invoke_cs.h \ + be_include/be_visitor_argument/post_invoke_cs.h \ be/be_visitor_argument/arglist.cpp \ be/be_visitor_argument/argument.cpp \ - be/be_visitor_argument/docall_cs.cpp \ be/be_visitor_argument/marshal_ss.cpp \ - be/be_visitor_argument/post_docall_cs.cpp \ - be/be_visitor_argument/post_docall_compiled_cs.cpp \ - be/be_visitor_argument/post_marshal_ss.cpp \ be/be_visitor_argument/post_upcall_ss.cpp \ - be/be_visitor_argument/pre_docall_cs.cpp \ - be/be_visitor_argument/pre_upcall_ss.cpp \ be/be_visitor_argument/upcall_ss.cpp \ be/be_visitor_argument/vardecl_ss.cpp \ - be/be_visitor_argument/compiled_marshal_cs.cpp \ - be/be_visitor_argument/compiled_marshal_ss.cpp \ - be/be_visitor_argument/pre_invoke_cs.cpp + be/be_visitor_argument/pre_invoke_cs.cpp \ + be/be_visitor_argument/invoke_cs.cpp \ + be/be_visitor_argument/post_invoke_cs.cpp .obj/be_visitor_array.o .obj/be_visitor_array.so .shobj/be_visitor_array.o .shobj/be_visitor_array.so: be/be_visitor_array.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -12326,9 +12305,7 @@ tags: be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ be_include/be_visitor_operation/rettype_vardecl_cs.h \ - be_include/be_visitor_operation/rettype_pre_docall_cs.h \ - be_include/be_visitor_operation/rettype_docall_cs.h \ - be_include/be_visitor_operation/rettype_post_docall_cs.h \ + be_include/be_visitor_operation/rettype_post_invoke_cs.h \ be_include/be_visitor_operation/rettype_return_cs.h \ be_include/be_visitor_operation/exceptlist_cs.h \ be_include/be_visitor_operation/argument.h \ @@ -12338,7 +12315,6 @@ tags: be_include/be_visitor_operation/rettype_assign_ss.h \ be_include/be_visitor_operation/rettype_post_upcall_ss.h \ be_include/be_visitor_operation/rettype_marshal_ss.h \ - be_include/be_visitor_operation/compiled_marshal.h \ be_include/be_visitor_operation/rettype_pre_invoke_cs.h \ be_include/be_visitor_operation/ami_ch.h \ be_include/be_visitor_operation/ami_cs.h \ @@ -12728,9 +12704,7 @@ tags: be_include/be_visitor_operation/rettype.h \ be_include/be_visitor_operation/rettype_is.h \ be_include/be_visitor_operation/rettype_vardecl_cs.h \ - be_include/be_visitor_operation/rettype_pre_docall_cs.h \ - be_include/be_visitor_operation/rettype_docall_cs.h \ - be_include/be_visitor_operation/rettype_post_docall_cs.h \ + be_include/be_visitor_operation/rettype_post_invoke_cs.h \ be_include/be_visitor_operation/rettype_return_cs.h \ be_include/be_visitor_operation/exceptlist_cs.h \ be_include/be_visitor_operation/argument.h \ @@ -12740,7 +12714,6 @@ tags: be_include/be_visitor_operation/rettype_assign_ss.h \ be_include/be_visitor_operation/rettype_post_upcall_ss.h \ be_include/be_visitor_operation/rettype_marshal_ss.h \ - be_include/be_visitor_operation/compiled_marshal.h \ be_include/be_visitor_operation/rettype_pre_invoke_cs.h \ be_include/be_visitor_operation/ami_ch.h \ be_include/be_visitor_operation/ami_cs.h \ @@ -12767,33 +12740,24 @@ tags: be_include/be_visitor_argument.h \ be_include/be_visitor_argument/argument.h \ be_include/be_visitor_argument/arglist.h \ - be_include/be_visitor_argument/pre_docall_cs.h \ - be_include/be_visitor_argument/docall_cs.h \ - be_include/be_visitor_argument/post_docall_cs.h \ - be_include/be_visitor_argument/post_docall_compiled_cs.h \ be_include/be_visitor_argument/vardecl_ss.h \ - be_include/be_visitor_argument/pre_upcall_ss.h \ be_include/be_visitor_argument/upcall_ss.h \ be_include/be_visitor_argument/post_upcall_ss.h \ be_include/be_visitor_argument/marshal_ss.h \ - be_include/be_visitor_argument/post_marshal_ss.h \ - be_include/be_visitor_argument/compiled_marshal_cs.h \ - be_include/be_visitor_argument/compiled_marshal_ss.h \ be_include/be_visitor_argument/pre_invoke_cs.h \ + be_include/be_visitor_argument/invoke_cs.h \ + be_include/be_visitor_argument/post_invoke_cs.h \ be/be_visitor_operation/operation_is.cpp \ be/be_visitor_operation/rettype.cpp \ be/be_visitor_operation/rettype_is.cpp \ be/be_visitor_operation/rettype_assign_ss.cpp \ - be/be_visitor_operation/rettype_docall_cs.cpp \ be/be_visitor_operation/rettype_marshal_ss.cpp \ - be/be_visitor_operation/rettype_post_docall_cs.cpp \ + be/be_visitor_operation/rettype_post_invoke_cs.cpp \ be/be_visitor_operation/rettype_post_upcall_ss.cpp \ - be/be_visitor_operation/rettype_pre_docall_cs.cpp \ be/be_visitor_operation/rettype_return_cs.cpp \ be/be_visitor_operation/rettype_vardecl_cs.cpp \ be/be_visitor_operation/rettype_vardecl_ss.cpp \ be/be_visitor_operation/tie_sh.cpp be/be_visitor_operation/tie_si.cpp \ - be/be_visitor_operation/compiled_marshal.cpp \ be/be_visitor_operation/rettype_pre_invoke_cs.cpp \ be/be_visitor_operation/ami_ch.cpp be/be_visitor_operation/ami_cs.cpp \ be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp \ diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index bb97dc2c812..58ff6db1063 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -99,7 +99,7 @@ int be_visitor_array_cs::visit_array (be_array *node) os->indent (); - *os << "void ::" << fname << "_forany" + *os << "void " << fname << "_forany" << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << fname << "_slice *tmp = ACE_static_cast (" @@ -272,12 +272,12 @@ int be_visitor_array_cs::visit_array (be_array *node) } *os << be_uidt_nl << "}\n\n"; - // If we contain an anonymous sequence, + // If we contain an anonymous sequence, // generate code for the seuqence here. if (bt->node_type () == AST_Decl::NT_sequence) { - if (this->gen_anonymous_base_type (bt, - TAO_CodeGen::TAO_SEQUENCE_CS) + if (this->gen_anonymous_base_type (bt, + TAO_CodeGen::TAO_SEQUENCE_CS) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -285,7 +285,7 @@ int be_visitor_array_cs::visit_array (be_array *node) "visit_array - " "gen_anonymous_base_type failed\n"), -1); - } + } } #if 0 diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 20305a8bab6..c7f223d8d18 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -83,67 +83,22 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl - << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl - << "if (!type->equivalent (" << node->tc_name () - << ", ACE_TRY_ENV)) // not equal" << be_idt_nl - << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl - << "return 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl - << "if (_tao_any.any_owns_data ())" << be_nl - << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl // else any does not own the data - << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl - << "TAO_InputCDR stream (" << be_idt << be_idt_nl - << "_tao_any._tao_get_cdr ()," << be_nl - << "_tao_any._tao_byte_order ()" << be_uidt_nl - << ");" << be_uidt_nl - << "if (stream >> *_tao_elem)" << be_nl - << "{" << be_idt_nl - << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl - << node->tc_name () << "," << be_nl - << "1," << be_nl - << "ACE_reinterpret_cast (void *, _tao_elem)," << be_nl - << node->name () << "::_tao_any_destructor" << be_uidt_nl - << ");" << be_uidt_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_nl - << "return 0;" << be_uidt_nl + << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*&," << be_nl + << "_tao_elem" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}\n\n"; *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl + << "_tao_elem = 0;" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl @@ -155,38 +110,32 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}" << be_nl << "else" << be_nl // else any does not own the data << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl + << node->name () << " *tmp;" << be_nl + << "ACE_NEW_RETURN (tmp, " << node->name () << ", 0);" << be_nl << "TAO_InputCDR stream (" << be_idt << be_idt_nl << "_tao_any._tao_get_cdr ()," << be_nl << "_tao_any._tao_byte_order ()" << be_uidt_nl << ");" << be_uidt_nl - << "if (stream >> *(" << node->name () << " *)_tao_elem)" << be_nl + << "if (stream >> *tmp)" << be_nl << "{" << be_idt_nl << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "ACE_reinterpret_cast (void *, ACE_const_cast (" - << node->name () << " *&, _tao_elem))," << be_nl + << "tmp," << be_nl << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl + << "_tao_elem = tmp;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl + << "{" << be_nl << "}" << be_nl << "ACE_ENDTRY;" << be_nl << "return 0;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 8c24c8eb6b6..a75aeb0bb23 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -75,7 +75,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "{" << be_nl; *os << "}\n\n"; - *os << "void ::" + *os << "void " << node->name () << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << node->name () << " *tmp = ACE_static_cast (" diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp index f4f627ca848..f685f67f85e 100644 --- a/TAO/TAO_IDL/be/be_visitor_factory.cpp +++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp @@ -421,7 +421,7 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx) case TAO_CodeGen::TAO_ATTRIBUTE_DIRECT_COLLOCATED_SS: case TAO_CodeGen::TAO_ATTRIBUTE_SMART_PROXY_CH: case TAO_CodeGen::TAO_ATTRIBUTE_SMART_PROXY_CS: - + return new be_visitor_attribute (new_ctx); case TAO_CodeGen::TAO_EXCEPTION_CH: @@ -613,7 +613,7 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx) case TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CH: return new be_visitor_operation_ami_ch (new_ctx); - + case TAO_CodeGen::TAO_AMI_SENDC_OPERATION_CS: return new be_compiled_visitor_operation_ami_cs (new_ctx); 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 36d5771da36..1ddc3d0e2a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -62,7 +62,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) // first generate the code for the static methods - *os << "void ::" + *os << "void " << node->name () << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << node->name () << " *tmp = ACE_static_cast (" diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index e93c413ec00..7eb01e87841 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -86,66 +86,65 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl + << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*&," << be_nl + << "_tao_elem" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl + << "}\n\n"; + + *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " + << node->name () << " *&_tao_elem)" << be_nl + << "{" << be_idt_nl + << "_tao_elem = 0;" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << "if (_tao_any.any_owns_data ())" << be_nl << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl + << "_tao_elem = ACE_static_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*," << be_nl + << "_tao_any.value ()" << be_uidt_nl + << ");" << be_uidt_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl // else any does not own the data << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl + << node->name () << " *tmp;" << be_nl + << "ACE_NEW_RETURN (tmp, " << node->name () << ", 0);" << be_nl << "TAO_InputCDR stream (" << be_idt << be_idt_nl << "_tao_any._tao_get_cdr ()," << be_nl << "_tao_any._tao_byte_order ()" << be_uidt_nl << ");" << be_uidt_nl - << "if (stream >> *_tao_elem)" << be_nl + << "if (stream >> *tmp)" << be_nl << "{" << be_idt_nl << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "ACE_reinterpret_cast (void *, _tao_elem)," << be_nl + << "ACE_static_cast (void *, tmp)," << be_nl << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl + << "_tao_elem = tmp;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl + << "{" << be_nl << "}" << be_nl << "ACE_ENDTRY;" << be_nl << "return 0;" << be_uidt_nl << "}\n\n"; - *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " - << node->name () << " *&_tao_elem)" << be_nl - << "{" << be_idt_nl - << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl - << node->name () << "*&," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl - << "}\n\n"; - node->cli_stub_any_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 2c45f1cccfb..f350d2d38ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -308,7 +308,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << " (void) // dtor" << be_nl << "{}" << be_nl - << "void ::" + << "void " << node->name () << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << node->name () << " *tmp = ACE_static_cast (" diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index f1d1cf5e053..88b6eaaa3c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -83,65 +83,63 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl + << "return _tao_any >>= ACE_const_cast(" + << "const " << node->name () << "*&,_tao_elem);" << be_uidt_nl + << "}\n\n"; + + *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " + << node->name () << " *&_tao_elem)" << be_nl + << "{" << be_idt_nl + << "_tao_elem = 0;" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << "if (_tao_any.any_owns_data ())" << be_nl << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl + << "_tao_elem = ACE_static_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*," << be_nl + << "_tao_any.value ()" << be_uidt_nl + << ");" << be_uidt_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl // else any does not own the data << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl + << node->name () << " *tmp;" << be_nl + << "ACE_NEW_RETURN (tmp, " << node->name () << ", 0);" << be_nl << "TAO_InputCDR stream (" << be_idt << be_idt_nl << "_tao_any._tao_get_cdr ()," << be_nl << "_tao_any._tao_byte_order ()" << be_uidt_nl << ");" << be_uidt_nl - << "if (stream >> *_tao_elem)" << be_nl + << "if (stream >> *tmp)" << be_nl << "{" << be_idt_nl << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "ACE_reinterpret_cast (void *, _tao_elem)," << be_nl + << "ACE_static_cast (void *, tmp)," << be_nl << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl + << "_tao_elem = tmp;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl + << "{" << be_nl << "}" << be_nl << "ACE_ENDTRY;" << be_nl << "return 0;" << be_uidt_nl << "}\n\n"; - *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " - << node->name () << " *&_tao_elem)" << be_nl - << "{" << be_nl - << " return _tao_any >>= ACE_const_cast(" - << node->name () << "*&,_tao_elem);" << be_nl - << "}\n\n"; - // all we have to do is to visit the scope and generate code if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp index 4943aa41311..daa59d3ce89 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp @@ -63,7 +63,7 @@ int be_visitor_structure_cs::visit_structure (be_structure *node) TAO_OutStream *os = this->ctx_->stream (); os->indent (); - *os << "void ::" + *os << "void " << node->name () << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << node->name () << " *tmp = ACE_static_cast (" diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 3530481ca18..7f660113241 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -92,54 +92,10 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << node->name () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl - << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl - << "if (!type->equivalent (" << node->tc_name () - << ", ACE_TRY_ENV)) // not equal" << be_idt_nl - << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl - << "return 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl - << "if (_tao_any.any_owns_data ())" << be_nl - << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl // else any does not own the data - << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl - << "TAO_InputCDR stream (" << be_idt << be_idt_nl - << "_tao_any._tao_get_cdr ()," << be_nl - << "_tao_any._tao_byte_order ()" << be_uidt_nl - << ");" << be_uidt_nl - << be_nl << "if (stream >> *_tao_elem)" << be_nl - << "{" << be_idt_nl - << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl - << node->tc_name () << "," << be_nl - << "1," << be_nl - << "ACE_reinterpret_cast (void *, _tao_elem)," << be_nl - << node->name () << "::_tao_any_destructor" << be_uidt_nl + << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*&," << be_nl + << "_tao_elem" << be_uidt_nl << ");" << be_uidt_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_nl - << "return 0;" << be_uidt_nl << "}\n\n"; *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl @@ -147,57 +103,51 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "const " << node->name () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl + << "_tao_elem = 0;" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << "if (_tao_any.any_owns_data ())" << be_nl << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl + << "_tao_elem = ACE_static_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*," << be_nl + << "_tao_any.value ()" << be_uidt_nl + << ");" << be_uidt_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl // else any does not own the data << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl + << node->name () << " *tmp;" << be_nl + << "ACE_NEW_RETURN (tmp, " << node->name () << ", 0);" << be_nl << "TAO_InputCDR stream (" << be_idt << be_idt_nl << "_tao_any._tao_get_cdr ()," << be_nl << "_tao_any._tao_byte_order ()" << be_uidt_nl - << ");" << be_uidt_nl; - - *os << be_nl << "if (stream >> *(" << node->name () - << " *)_tao_elem)" << be_nl + << ");" << be_uidt_nl + << be_nl << "if (stream >> *tmp)" << be_nl << "{" << be_idt_nl - << "((CORBA::Any *)&_tao_any)->_tao_replace (" - << be_idt << be_idt_nl + << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "ACE_reinterpret_cast (void *, ACE_const_cast (" - << node->name () << " *&, _tao_elem))," << be_nl - << node->name () << "::_tao_any_destructor" << be_nl + << "ACE_static_cast (void *, tmp)," << be_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl + << "_tao_elem = tmp;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "{" << be_nl << "}" << be_nl << "ACE_ENDTRY;" << be_nl << "return 0;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index b3d027baa0e..bf9ec529b9f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -195,7 +195,7 @@ int be_visitor_union_cs::visit_union (be_union *node) << "this->_reset (this->disc_, 1);" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "void ::" + *os << "void " << node->name () << "::_tao_any_destructor (void *x)" << be_nl << "{" << be_idt_nl << node->name () << " *tmp = ACE_static_cast (" diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index a18efda7ed7..e7f014f5fe2 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -388,11 +388,11 @@ TAO_NAMESPACE_BEGIN (GIOP) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TargetAddress, &_tc_TAO_tc_GIOP_TargetAddress) TAO_NAMESPACE_END -VOID +void GIOP::IORAddressingInfo::_tao_any_destructor (void *x) { GIOP::IORAddressingInfo *tmp = ACE_static_cast (GIOP::IORAddressingInfo*,x); - delete x; + delete tmp; } void operator<<= (CORBA::Any &_tao_any, const GIOP::IORAddressingInfo &_tao_elem) // copying diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index ec55e3b7187..bad59414e3e 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -548,7 +548,7 @@ void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // void IOP::TaggedProfile::_tao_any_destructor (void *x) { - IOP::TaggedProfile *tmp = ACE_const_cast(IOP::TaggedProfile*,x); + IOP::TaggedProfile *tmp = ACE_static_cast(IOP::TaggedProfile*,x); delete tmp; } @@ -679,7 +679,7 @@ void operator<<= (CORBA::Any &_tao_any, const IOP::IOR &_tao_elem) // copying void IOP::IOR::_tao_any_destructor (void *x) { - IOP::IOR *tmp = ACE_const_cast(IOP::IOR*,x); + IOP::IOR *tmp = ACE_static_cast(IOP::IOR*,x); delete tmp; } @@ -810,7 +810,7 @@ void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedComponent &_tao_elem) / void IOP::TaggedComponent::_tao_any_destructor (void *x) { - IOP::TaggedComponent *tmp = ACE_const_cast(IOP::TaggedComponent*,x); + IOP::TaggedComponent *tmp = ACE_static_cast(IOP::TaggedComponent*,x); delete tmp; } @@ -946,7 +946,7 @@ void operator<<= ( void IOP::MultipleComponentProfile::_tao_any_destructor (void *x) { - IOP::MultipleComponentProfile *tmp = ACE_const_cast(IOP::MultipleComponentProfile*,x); + IOP::MultipleComponentProfile *tmp = ACE_static_cast(IOP::MultipleComponentProfile*,x); delete tmp; } @@ -1077,7 +1077,7 @@ void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // void IOP::ServiceContext::_tao_any_destructor (void *x) { - IOP::ServiceContext *tmp = ACE_const_cast(IOP::ServiceContext*,x); + IOP::ServiceContext *tmp = ACE_static_cast(IOP::ServiceContext*,x); delete tmp; } @@ -1213,7 +1213,7 @@ void operator<<= ( void IOP::ServiceContextList::_tao_any_destructor (void *x) { - IOP::ServiceContextList *tmp = ACE_const_cast(IOP::ServiceContextList*,x); + IOP::ServiceContextList *tmp = ACE_static_cast(IOP::ServiceContextList*,x); delete tmp; } diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp index dcc0257c920..222aecb15fe 100644 --- a/TAO/tao/ImplRepoC.cpp +++ b/TAO/tao/ImplRepoC.cpp @@ -13,7 +13,7 @@ #include "ImplRepoC.i" #endif /* !defined INLINE */ -void ::ImplementationRepository::ServerObject::_tao_any_destructor (void *x) +void ImplementationRepository::ServerObject::_tao_any_destructor (void *x) { ImplementationRepository::ServerObject *tmp = ACE_static_cast (ImplementationRepository::ServerObject*,x); CORBA::release (tmp); @@ -52,7 +52,7 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec return TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); } -ImplementationRepository::ServerObject_ptr +ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj) { if (!CORBA::is_nil (obj)) @@ -67,15 +67,15 @@ void ImplementationRepository::ServerObject::ping ( CORBA::SystemException )) { + - - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "ping", @@ -119,7 +119,7 @@ void ImplementationRepository::ServerObject::ping ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -133,7 +133,7 @@ void ImplementationRepository::ServerObject::ping ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -148,10 +148,10 @@ void ImplementationRepository::ServerObject::ping ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -178,15 +178,15 @@ void ImplementationRepository::ServerObject::shutdown ( CORBA::SystemException )) { + - - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown", @@ -230,7 +230,7 @@ void ImplementationRepository::ServerObject::shutdown ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -244,7 +244,7 @@ void ImplementationRepository::ServerObject::shutdown ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -259,10 +259,10 @@ void ImplementationRepository::ServerObject::shutdown ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -356,7 +356,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is + // doesnt get into an infinite loop in <unregister_proxy_factory> as it is // invoked in the destructor of the class too. this->delete_proxy_factory_ = 1; delete this->proxy_factory_; @@ -376,10 +376,10 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (1), + TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (1), 0); - - + + return this->proxy_factory_->create_proxy (proxy); } @@ -443,10 +443,10 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] = 20, 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 (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (CORBA::tk_struct, sizeof (_oc_ImplementationRepository_EnvironmentVariable), (char *) &_oc_ImplementationRepository_EnvironmentVariable, 0, sizeof (ImplementationRepository::EnvironmentVariable)); @@ -454,7 +454,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable) TAO_NAMESPACE_END -void ::ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *x) +void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *x) { ImplementationRepository::EnvironmentVariable *tmp = ACE_static_cast (ImplementationRepository::EnvironmentVariable*,x); delete tmp; @@ -465,7 +465,7 @@ 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (CORBA::tk_alias, sizeof (_oc_ImplementationRepository_Address), (char *) &_oc_ImplementationRepository_Address, 0, sizeof (ImplementationRepository::Address)); @@ -475,7 +475,7 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_Implementati TAO_NAMESPACE_END #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_ @@ -484,43 +484,43 @@ TAO_NAMESPACE_END { ImplementationRepository::EnvironmentVariable* tmp = 0; tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length); - + if (this->buffer_ != 0) { ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old); - + } this->buffer_ = tmp; } - + void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_); - + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp); this->buffer_ = 0; - } - + } + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_ @@ -532,35 +532,35 @@ TAO_NAMESPACE_END ImplementationRepository::EnvironmentList::EnvironmentList (void) {} ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor {} -void ::ImplementationRepository::EnvironmentList::_tao_any_destructor (void *x) +void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *x) { ImplementationRepository::EnvironmentList *tmp = ACE_static_cast (ImplementationRepository::EnvironmentList*,x); delete tmp; @@ -584,10 +584,10 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] = 20, 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 (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -621,7 +621,7 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, 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 (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs @@ -639,17 +639,17 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] = 20, 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 (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, 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 (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind @@ -669,7 +669,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions) TAO_NAMESPACE_END -void ::ImplementationRepository::StartupOptions::_tao_any_destructor (void *x) +void ImplementationRepository::StartupOptions::_tao_any_destructor (void *x) { ImplementationRepository::StartupOptions *tmp = ACE_static_cast (ImplementationRepository::StartupOptions*,x); delete tmp; @@ -682,10 +682,10 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 18, 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 (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind @@ -695,7 +695,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, 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 (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs @@ -713,17 +713,17 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 20, 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 (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, 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 (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind @@ -744,7 +744,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] = 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -753,7 +753,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation) TAO_NAMESPACE_END -void ::ImplementationRepository::ServerInformation::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x) { ImplementationRepository::ServerInformation *tmp = ACE_static_cast (ImplementationRepository::ServerInformation*,x); delete tmp; @@ -761,7 +761,7 @@ void ::ImplementationRepository::ServerInformation::_tao_any_destructor (void *x #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_ @@ -770,43 +770,43 @@ void ::ImplementationRepository::ServerInformation::_tao_any_destructor (void *x { ImplementationRepository::ServerInformation* tmp = 0; tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length); - + if (this->buffer_ != 0) { ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old); - + } this->buffer_ = tmp; } - + void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_); - + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp); this->buffer_ = 0; - } - + } + ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_ @@ -818,35 +818,35 @@ void ::ImplementationRepository::ServerInformation::_tao_any_destructor (void *x ImplementationRepository::ServerInformationList::ServerInformationList (void) {} ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor {} -void ::ImplementationRepository::ServerInformationList::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *x) { ImplementationRepository::ServerInformationList *tmp = ACE_static_cast (ImplementationRepository::ServerInformationList*,x); delete tmp; @@ -870,10 +870,10 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 18, 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 (0x65720000), // name = logical_server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000), // name = server - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000), // name = startup CORBA::tk_struct, // typecode kind @@ -883,7 +883,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = StartupOptions 4, // member count 13, 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 (0x656e7400), // name = environment CORBA::tk_alias, // typecode kind for typedefs @@ -901,17 +901,17 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 20, 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 (0x0), // name = name - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 6, 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 (0x79000000), // name = working_directory - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000), // name = activation CORBA::tk_enum, // typecode kind @@ -932,7 +932,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] = 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 (0x0), // repository ID = IDL:ImplementationRepository/Address:1.0 8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300), // name = Address - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -944,7 +944,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) TAO_NAMESPACE_END -void ::ImplementationRepository::Administration::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::_tao_any_destructor (void *x) { ImplementationRepository::Administration *tmp = ACE_static_cast (ImplementationRepository::Administration*,x); CORBA::release (tmp); @@ -983,7 +983,7 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr return TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); } -ImplementationRepository::Administration_ptr +ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_duplicate (Administration_ptr obj) { if (!CORBA::is_nil (obj)) @@ -1002,7 +1002,7 @@ ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered { } -void ::ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *x) { ImplementationRepository::Administration::AlreadyRegistered *tmp = ACE_static_cast (ImplementationRepository::Administration::AlreadyRegistered*,x); delete tmp; @@ -1024,7 +1024,7 @@ ImplementationRepository::Administration::AlreadyRegistered::operator= (const :: } // narrow -ImplementationRepository::Administration::AlreadyRegistered_ptr +ImplementationRepository::Administration::AlreadyRegistered_ptr ImplementationRepository::Administration::AlreadyRegistered::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) // same type @@ -1088,7 +1088,7 @@ ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) { } -void ::ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *x) { ImplementationRepository::Administration::CannotActivate *tmp = ACE_static_cast (ImplementationRepository::Administration::CannotActivate*,x); delete tmp; @@ -1112,7 +1112,7 @@ ImplementationRepository::Administration::CannotActivate::operator= (const ::Imp } // narrow -ImplementationRepository::Administration::CannotActivate_ptr +ImplementationRepository::Administration::CannotActivate_ptr ImplementationRepository::Administration::CannotActivate::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) // same type @@ -1170,7 +1170,7 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActiv 15, ACE_NTOHL (0x43616e6e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000), // name = CannotActivate 1, // member count 7, ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_CannotActivate (CORBA::tk_except, sizeof (_oc_ImplementationRepository_Administration_CannotActivate), (char *) &_oc_ImplementationRepository_Administration_CannotActivate, 0, sizeof (ImplementationRepository::Administration::CannotActivate)); @@ -1187,7 +1187,7 @@ ImplementationRepository::Administration::NotFound::~NotFound (void) { } -void ::ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *x) { ImplementationRepository::Administration::NotFound *tmp = ACE_static_cast (ImplementationRepository::Administration::NotFound*,x); delete tmp; @@ -1209,7 +1209,7 @@ ImplementationRepository::Administration::NotFound::operator= (const ::Implement } // narrow -ImplementationRepository::Administration::NotFound_ptr +ImplementationRepository::Administration::NotFound_ptr ImplementationRepository::Administration::NotFound::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) // same type @@ -1272,21 +1272,21 @@ void ImplementationRepository::Administration::activate_server ( ImplementationRepository::Administration::CannotActivate )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "activate_server", @@ -1330,7 +1330,7 @@ void ImplementationRepository::Administration::activate_server ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -1349,7 +1349,7 @@ void ImplementationRepository::Administration::activate_server ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -1364,10 +1364,10 @@ void ImplementationRepository::Administration::activate_server ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -1397,20 +1397,20 @@ void ImplementationRepository::Administration::register_server ( ImplementationRepository::Administration::AlreadyRegistered )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = { {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "register_server", @@ -1454,7 +1454,7 @@ void ImplementationRepository::Administration::register_server ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -1474,7 +1474,7 @@ void ImplementationRepository::Administration::register_server ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -1489,10 +1489,10 @@ void ImplementationRepository::Administration::register_server ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -1521,15 +1521,15 @@ void ImplementationRepository::Administration::reregister_server ( CORBA::SystemException )) { + - - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "reregister_server", @@ -1573,7 +1573,7 @@ void ImplementationRepository::Administration::reregister_server ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -1593,7 +1593,7 @@ void ImplementationRepository::Administration::reregister_server ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -1608,10 +1608,10 @@ void ImplementationRepository::Administration::reregister_server ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -1640,20 +1640,20 @@ void ImplementationRepository::Administration::remove_server ( ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "remove_server", @@ -1697,7 +1697,7 @@ void ImplementationRepository::Administration::remove_server ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -1716,7 +1716,7 @@ void ImplementationRepository::Administration::remove_server ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -1731,10 +1731,10 @@ void ImplementationRepository::Administration::remove_server ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -1763,20 +1763,20 @@ void ImplementationRepository::Administration::shutdown_server ( ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown_server", @@ -1820,7 +1820,7 @@ void ImplementationRepository::Administration::shutdown_server ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -1839,7 +1839,7 @@ void ImplementationRepository::Administration::shutdown_server ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -1854,10 +1854,10 @@ void ImplementationRepository::Administration::shutdown_server ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -1888,20 +1888,20 @@ char * ImplementationRepository::Administration::server_is_running ( ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; CORBA::String_var _tao_safe_retval; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_running", @@ -1945,7 +1945,7 @@ char * ImplementationRepository::Administration::server_is_running ( TAO_INTERCEPTOR_CHECK_RETURN (0); CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK_RETURN (0); @@ -1988,10 +1988,10 @@ char * ImplementationRepository::Administration::server_is_running ( ); TAO_INTERCEPTOR_CHECK_RETURN (0); break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -2020,20 +2020,20 @@ void ImplementationRepository::Administration::server_is_shutting_down ( ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_shutting_down", @@ -2077,7 +2077,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -2096,7 +2096,7 @@ void ImplementationRepository::Administration::server_is_shutting_down ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -2111,10 +2111,10 @@ void ImplementationRepository::Administration::server_is_shutting_down ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -2144,20 +2144,20 @@ void ImplementationRepository::Administration::find ( ImplementationRepository::Administration::NotFound )) { - - static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = + + static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = { {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} }; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation); TAO_GIOP_Twoway_Invocation _tao_call ( istub, @@ -2202,13 +2202,13 @@ void ImplementationRepository::Administration::find ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << server) + (_tao_out << server) )) TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); int _invoke_status = @@ -2240,10 +2240,10 @@ void ImplementationRepository::Administration::find ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -2273,15 +2273,15 @@ void ImplementationRepository::Administration::list ( CORBA::SystemException )) { + - - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList); TAO_GIOP_Twoway_Invocation _tao_call ( istub, @@ -2326,13 +2326,13 @@ void ImplementationRepository::Administration::list ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << how_many) + (_tao_out << how_many) )) TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); int _invoke_status = @@ -2365,10 +2365,10 @@ void ImplementationRepository::Administration::list ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -2462,7 +2462,7 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is + // doesnt get into an infinite loop in <unregister_proxy_factory> as it is // invoked in the destructor of the class too. this->delete_proxy_factory_ = 1; delete this->proxy_factory_; @@ -2482,10 +2482,10 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_Administration_Default_Proxy_Factory (1), + TAO_ImplementationRepository_Administration_Default_Proxy_Factory (1), 0); - - + + return this->proxy_factory_->create_proxy (proxy); } @@ -2673,7 +2673,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) TAO_NAMESPACE_END -void ::ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *x) { ImplementationRepository::ServerInformationIterator *tmp = ACE_static_cast (ImplementationRepository::ServerInformationIterator*,x); CORBA::release (tmp); @@ -2712,7 +2712,7 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository return TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); } -ImplementationRepository::ServerInformationIterator_ptr +ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj) { if (!CORBA::is_nil (obj)) @@ -2729,15 +2729,15 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( CORBA::SystemException )) { - + CORBA::Boolean _tao_retval = 0; - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - + ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( istub, @@ -2782,13 +2782,13 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); if (!( - (_tao_out << how_many) + (_tao_out << how_many) )) TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); @@ -2824,10 +2824,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n ( ); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -2854,15 +2854,15 @@ void ImplementationRepository::ServerInformationIterator::destroy ( CORBA::SystemException )) { + - - - + + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW (CORBA::INTERNAL ()); - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "destroy", @@ -2906,7 +2906,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( TAO_INTERCEPTOR_CHECK; CORBA::Short flag = 131; // Tremporary hack until GIOP 1.2 is implemented. - + _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); TAO_INTERCEPTOR_CHECK; @@ -2920,7 +2920,7 @@ void ImplementationRepository::ServerInformationIterator::destroy ( { TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } - + TAO_INTERCEPTOR ( _tao_vfr.postinvoke ( _tao_call.request_id (), @@ -2935,10 +2935,10 @@ void ImplementationRepository::ServerInformationIterator::destroy ( ); TAO_INTERCEPTOR_CHECK; break; - + } #if defined (TAO_HAS_INTERCEPTORS) - + } ACE_CATCHANY { @@ -3032,7 +3032,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0) { // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it - // doesnt get into an infinite loop in <unregister_proxy_factory> as it is + // doesnt get into an infinite loop in <unregister_proxy_factory> as it is // invoked in the destructor of the class too. this->delete_proxy_factory_ = 1; delete this->proxy_factory_; @@ -3052,10 +3052,10 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator // Verify that an <proxy_factory_> is available else make one. if (this->proxy_factory_ == 0) ACE_NEW_RETURN (this->proxy_factory_, - TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (1), + TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (1), 0); - - + + return this->proxy_factory_->create_proxy (proxy); } @@ -3125,7 +3125,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_p if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_ServerObject, + ImplementationRepository::_tc_ServerObject, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -3155,7 +3155,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerObject::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_ServerObject, 1, @@ -3211,60 +3211,60 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVar CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::EnvironmentVariable *&_tao_elem) { + return _tao_any >>= ACE_const_cast(ImplementationRepository::EnvironmentVariable*&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (ImplementationRepository::EnvironmentVariable *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const ImplementationRepository::EnvironmentVariable*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::EnvironmentVariable, 0); + ImplementationRepository::EnvironmentVariable *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::EnvironmentVariable, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_EnvironmentVariable, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), ImplementationRepository::EnvironmentVariable::_tao_any_destructor ); - ACE_TRY_CHECK; + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentVariable *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(ImplementationRepository::EnvironmentVariable*&,_tao_elem); -} - void operator<<= ( CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentList &_tao_elem @@ -3297,99 +3297,58 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::EnvironmentLis CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::EnvironmentList *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (ImplementationRepository::EnvironmentList *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::EnvironmentList, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - ImplementationRepository::_tc_EnvironmentList, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - ImplementationRepository::EnvironmentList::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::EnvironmentList*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::EnvironmentList *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (ImplementationRepository::EnvironmentList *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const ImplementationRepository::EnvironmentList*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::EnvironmentList, 0); + ImplementationRepository::EnvironmentList *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::EnvironmentList, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(ImplementationRepository::EnvironmentList *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_EnvironmentList, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (ImplementationRepository::EnvironmentList *&, _tao_elem)), + ACE_static_cast (void *, tmp), ImplementationRepository::EnvironmentList::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (ImplementationRepository::EnvironmentList *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (ImplementationRepository::EnvironmentList *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -3460,60 +3419,60 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::StartupOptions CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::StartupOptions *&_tao_elem) { + return _tao_any >>= ACE_const_cast(ImplementationRepository::StartupOptions*&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::StartupOptions *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (ImplementationRepository::StartupOptions *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const ImplementationRepository::StartupOptions*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::StartupOptions, 0); + ImplementationRepository::StartupOptions *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::StartupOptions, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_StartupOptions, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), ImplementationRepository::StartupOptions::_tao_any_destructor ); - ACE_TRY_CHECK; + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::StartupOptions *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(ImplementationRepository::StartupOptions*&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation &_tao_elem) // copying { TAO_OutputCDR stream; @@ -3541,60 +3500,60 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformation *&_tao_elem) { + return _tao_any >>= ACE_const_cast(ImplementationRepository::ServerInformation*&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (ImplementationRepository::ServerInformation *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const ImplementationRepository::ServerInformation*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::ServerInformation, 0); + ImplementationRepository::ServerInformation *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::ServerInformation, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_ServerInformation, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_static_cast (void *, tmp), ImplementationRepository::ServerInformation::_tao_any_destructor ); - ACE_TRY_CHECK; + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformation *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(ImplementationRepository::ServerInformation*&,_tao_elem); -} - void operator<<= ( CORBA::Any &_tao_any, const ImplementationRepository::ServerInformationList &_tao_elem @@ -3627,99 +3586,58 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::ServerInformationList *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (ImplementationRepository::ServerInformationList *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::ServerInformationList, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - ImplementationRepository::_tc_ServerInformationList, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - ImplementationRepository::ServerInformationList::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::ServerInformationList*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::ServerInformationList *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { - _tao_elem = (ImplementationRepository::ServerInformationList *)_tao_any.value (); + _tao_elem = ACE_static_cast( + const ImplementationRepository::ServerInformationList*, + _tao_any.value () + ); return 1; } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::ServerInformationList, 0); + ImplementationRepository::ServerInformationList *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::ServerInformationList, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(ImplementationRepository::ServerInformationList *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_ServerInformationList, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (ImplementationRepository::ServerInformationList *&, _tao_elem)), + ACE_static_cast (void *, tmp), ImplementationRepository::ServerInformationList::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (ImplementationRepository::ServerInformationList *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (ImplementationRepository::ServerInformationList *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -3734,7 +3652,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_Administration, + ImplementationRepository::_tc_Administration, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -3764,7 +3682,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::Administration::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_Administration, 1, @@ -3820,62 +3738,20 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::AlreadyRegistered, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - ImplementationRepository::Administration::_tc_AlreadyRegistered, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::AlreadyRegistered*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::AlreadyRegistered *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -3886,33 +3762,31 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::AlreadyRegistered, 0); + ImplementationRepository::Administration::AlreadyRegistered *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::AlreadyRegistered, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(ImplementationRepository::Administration::AlreadyRegistered *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::Administration::_tc_AlreadyRegistered, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (ImplementationRepository::Administration::AlreadyRegistered *&, _tao_elem)), + tmp, ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (ImplementationRepository::Administration::AlreadyRegistered *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (ImplementationRepository::Administration::AlreadyRegistered *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -3945,62 +3819,20 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::CannotActivate *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::CannotActivate, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - ImplementationRepository::Administration::_tc_CannotActivate, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - ImplementationRepository::Administration::CannotActivate::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::CannotActivate*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::CannotActivate *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4011,33 +3843,31 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::CannotActivate, 0); + ImplementationRepository::Administration::CannotActivate *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::CannotActivate, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(ImplementationRepository::Administration::CannotActivate *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::Administration::_tc_CannotActivate, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (ImplementationRepository::Administration::CannotActivate *&, _tao_elem)), + tmp, ImplementationRepository::Administration::CannotActivate::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (ImplementationRepository::Administration::CannotActivate *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (ImplementationRepository::Administration::CannotActivate *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -4070,62 +3900,20 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository::Administration::NotFound *&_tao_elem) { - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV)) // not equal - { - _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::NotFound, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - ImplementationRepository::Administration::_tc_NotFound, - 1, - ACE_reinterpret_cast (void *, _tao_elem), - ImplementationRepository::Administration::NotFound::_tao_any_destructor - ); - return 1; - } - else - { - delete _tao_elem; - _tao_elem = 0; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - _tao_elem = 0; - return 0; - } - ACE_ENDTRY; - return 0; + return _tao_any >>= ACE_const_cast( + const ImplementationRepository::Administration::NotFound*&, + _tao_elem + ); } CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepository::Administration::NotFound *&_tao_elem) { + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4136,33 +3924,31 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo } else { - ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::NotFound, 0); + ImplementationRepository::Administration::NotFound *tmp; + ACE_NEW_RETURN (tmp, ImplementationRepository::Administration::NotFound, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *(ImplementationRepository::Administration::NotFound *)_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::Administration::_tc_NotFound, 1, - ACE_reinterpret_cast (void *, ACE_const_cast (ImplementationRepository::Administration::NotFound *&, _tao_elem)), + tmp, ImplementationRepository::Administration::NotFound::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete ACE_const_cast (ImplementationRepository::Administration::NotFound *&, _tao_elem); - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete ACE_const_cast (ImplementationRepository::Administration::NotFound *&, _tao_elem); - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; @@ -4177,7 +3963,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat if (stream << _tao_elem) { _tao_any._tao_replace ( - ImplementationRepository::_tc_ServerInformationIterator, + ImplementationRepository::_tc_ServerInformationIterator, TAO_ENCAP_BYTE_ORDER, stream.begin (), 1, @@ -4207,7 +3993,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository { _tao_elem = ImplementationRepository::ServerInformationIterator::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); ACE_TRY_CHECK; - + ((CORBA::Any *)&_tao_any)->_tao_replace ( ImplementationRepository::_tc_ServerInformationIterator, 1, @@ -4265,7 +4051,7 @@ CORBA::Boolean operator>> ( // 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; @@ -4307,7 +4093,7 @@ CORBA::Boolean operator>> ( // 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; @@ -4319,3 +4105,4 @@ CORBA::Boolean operator>> ( } return 0; // error } + diff --git a/TAO/tao/ImplRepoC.h b/TAO/tao/ImplRepoC.h index 1c4fe4589b5..2128c84be4f 100644 --- a/TAO/tao/ImplRepoC.h +++ b/TAO/tao/ImplRepoC.h @@ -20,7 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "corbafwd.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -49,7 +48,7 @@ TAO_NAMESPACE ImplementationRepository class ServerObject; typedef ServerObject *ServerObject_ptr; - + #endif /* end #if !defined */ @@ -63,14 +62,14 @@ TAO_NAMESPACE ImplementationRepository ServerObject_var (ServerObject_ptr); ServerObject_var (const ServerObject_var &); // copy constructor ~ServerObject_var (void); // destructor - + ServerObject_var &operator= (ServerObject_ptr); ServerObject_var &operator= (const ServerObject_var &); ServerObject_ptr operator-> (void) const; - + operator const ServerObject_ptr &() const; operator ServerObject_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerObject_ptr in (void) const; ServerObject_ptr &inout (void); ServerObject_ptr &out (void); @@ -100,7 +99,7 @@ TAO_NAMESPACE ImplementationRepository operator ServerObject_ptr &(); ServerObject_ptr &ptr (void); ServerObject_ptr operator-> (void); - + private: ServerObject_ptr &ptr_; }; @@ -124,12 +123,12 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) static ServerObject_ptr _duplicate (ServerObject_ptr obj); static ServerObject_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static ServerObject_ptr _nil (void) @@ -140,7 +139,7 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) static void _tao_any_destructor (void*); virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -148,7 +147,7 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) )); virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -156,16 +155,16 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) )); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: ServerObject (void); - ServerObject (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, + ServerObject (TAO_Stub *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~ServerObject (void); @@ -177,14 +176,14 @@ class TAO_Export ServerObject : public virtual ACE_CORBA_1 (Object) class TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory { public: - + TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (int register_proxy_factory = 1); - + virtual ~TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (void); - + virtual ServerObject_ptr create_proxy ( ServerObject_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); }; @@ -192,23 +191,23 @@ public: class TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter { public: - + friend class ACE_Singleton<TAO_ImplementationRepository_ServerObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; - + int register_proxy_factory ( TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory *df, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + int unregister_proxy_factory ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + ServerObject_ptr create_proxy ( ServerObject_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); @@ -230,7 +229,7 @@ protected: TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (::ImplementationRepository::ServerObject_ptr proxy); ~TAO_ImplementationRepository_ServerObject_Smart_Proxy_Base (void); virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -238,7 +237,7 @@ protected: )); virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -277,18 +276,18 @@ public: EnvironmentVariable_var (EnvironmentVariable *); EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor ~EnvironmentVariable_var (void); // destructor - + EnvironmentVariable_var &operator= (EnvironmentVariable *); EnvironmentVariable_var &operator= (const EnvironmentVariable_var &); EnvironmentVariable *operator-> (void); const EnvironmentVariable *operator-> (void) const; - + operator const EnvironmentVariable &() const; operator EnvironmentVariable &(); operator EnvironmentVariable &() const; operator EnvironmentVariable *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const EnvironmentVariable &in (void) const; EnvironmentVariable &inout (void); EnvironmentVariable *&out (void); @@ -310,7 +309,7 @@ public: operator EnvironmentVariable *&(); EnvironmentVariable *&ptr (void); EnvironmentVariable *operator-> (void); - + private: EnvironmentVariable *&ptr_; // assignment from T_var not allowed @@ -326,7 +325,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ @@ -334,9 +333,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor. - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum, CORBA::ULong length, EnvironmentVariable *data, @@ -353,7 +352,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0); const EnvironmentVariable *get_buffer (void) const; void replace (CORBA::ULong max, @@ -365,7 +364,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ @@ -378,20 +377,20 @@ typedef EnvironmentList* EnvironmentList_ptr; // EnvironmentList // ************************************************************* -class TAO_Export EnvironmentList : public +class TAO_Export EnvironmentList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: EnvironmentList (void); // default ctor EnvironmentList (CORBA::ULong max); // uses max size EnvironmentList ( - CORBA::ULong max, - CORBA::ULong length, - EnvironmentVariable *buffer, + CORBA::ULong max, + CORBA::ULong length, + EnvironmentVariable *buffer, CORBA::Boolean release=0 ); EnvironmentList (const EnvironmentList &); // copy ctor @@ -422,19 +421,19 @@ public: EnvironmentList_var (EnvironmentList *); EnvironmentList_var (const EnvironmentList_var &); // copy constructor ~EnvironmentList_var (void); // destructor - + EnvironmentList_var &operator= (EnvironmentList *); EnvironmentList_var &operator= (const EnvironmentList_var &); EnvironmentList *operator-> (void); const EnvironmentList *operator-> (void) const; - + operator const EnvironmentList &() const; operator EnvironmentList &(); operator EnvironmentList &() const; operator EnvironmentList *&(); // variable-size base types only - + EnvironmentVariable &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const EnvironmentList &in (void) const; EnvironmentList &inout (void); EnvironmentList *&out (void); @@ -464,7 +463,7 @@ public: EnvironmentList *&ptr (void); EnvironmentList *operator-> (void); EnvironmentVariable &operator[] (CORBA::ULong index); - + private: EnvironmentList *&ptr_; // assignment from T_var not allowed @@ -512,18 +511,18 @@ public: StartupOptions_var (StartupOptions *); StartupOptions_var (const StartupOptions_var &); // copy constructor ~StartupOptions_var (void); // destructor - + StartupOptions_var &operator= (StartupOptions *); StartupOptions_var &operator= (const StartupOptions_var &); StartupOptions *operator-> (void); const StartupOptions *operator-> (void) const; - + operator const StartupOptions &() const; operator StartupOptions &(); operator StartupOptions &() const; operator StartupOptions *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const StartupOptions &in (void) const; StartupOptions &inout (void); StartupOptions *&out (void); @@ -545,7 +544,7 @@ public: operator StartupOptions *&(); StartupOptions *&ptr (void); StartupOptions *operator-> (void); - + private: StartupOptions *&ptr_; // assignment from T_var not allowed @@ -579,18 +578,18 @@ public: ServerInformation_var (ServerInformation *); ServerInformation_var (const ServerInformation_var &); // copy constructor ~ServerInformation_var (void); // destructor - + ServerInformation_var &operator= (ServerInformation *); ServerInformation_var &operator= (const ServerInformation_var &); ServerInformation *operator-> (void); const ServerInformation *operator-> (void) const; - + operator const ServerInformation &() const; operator ServerInformation &(); operator ServerInformation &() const; operator ServerInformation *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const ServerInformation &in (void) const; ServerInformation &inout (void); ServerInformation *&out (void); @@ -612,7 +611,7 @@ public: operator ServerInformation *&(); ServerInformation *&ptr (void); ServerInformation *operator-> (void); - + private: ServerInformation *&ptr_; // assignment from T_var not allowed @@ -623,7 +622,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ @@ -631,9 +630,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor. - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum, CORBA::ULong length, ServerInformation *data, @@ -650,7 +649,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ServerInformation *get_buffer (CORBA::Boolean orphan = 0); const ServerInformation *get_buffer (void) const; void replace (CORBA::ULong max, @@ -662,7 +661,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ @@ -675,20 +674,20 @@ typedef ServerInformationList* ServerInformationList_ptr; // ServerInformationList // ************************************************************* -class TAO_Export ServerInformationList : public +class TAO_Export ServerInformationList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: ServerInformationList (void); // default ctor ServerInformationList (CORBA::ULong max); // uses max size ServerInformationList ( - CORBA::ULong max, - CORBA::ULong length, - ServerInformation *buffer, + CORBA::ULong max, + CORBA::ULong length, + ServerInformation *buffer, CORBA::Boolean release=0 ); ServerInformationList (const ServerInformationList &); // copy ctor @@ -719,19 +718,19 @@ public: ServerInformationList_var (ServerInformationList *); ServerInformationList_var (const ServerInformationList_var &); // copy constructor ~ServerInformationList_var (void); // destructor - + ServerInformationList_var &operator= (ServerInformationList *); ServerInformationList_var &operator= (const ServerInformationList_var &); ServerInformationList *operator-> (void); const ServerInformationList *operator-> (void) const; - + operator const ServerInformationList &() const; operator ServerInformationList &(); operator ServerInformationList &() const; operator ServerInformationList *&(); // variable-size base types only - + ServerInformation &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const ServerInformationList &in (void) const; ServerInformationList &inout (void); ServerInformationList *&out (void); @@ -761,7 +760,7 @@ public: ServerInformationList *&ptr (void); ServerInformationList *operator-> (void); ServerInformation &operator[] (CORBA::ULong index); - + private: ServerInformationList *&ptr_; // assignment from T_var not allowed @@ -793,14 +792,14 @@ public: ServerInformationIterator_var (ServerInformationIterator_ptr); ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor ~ServerInformationIterator_var (void); // destructor - + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); ServerInformationIterator_ptr operator-> (void) const; - + operator const ServerInformationIterator_ptr &() const; operator ServerInformationIterator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerInformationIterator_ptr in (void) const; ServerInformationIterator_ptr &inout (void); ServerInformationIterator_ptr &out (void); @@ -830,7 +829,7 @@ public: operator ServerInformationIterator_ptr &(); ServerInformationIterator_ptr &ptr (void); ServerInformationIterator_ptr operator-> (void); - + private: ServerInformationIterator_ptr &ptr_; }; @@ -858,14 +857,14 @@ public: Administration_var (Administration_ptr); Administration_var (const Administration_var &); // copy constructor ~Administration_var (void); // destructor - + Administration_var &operator= (Administration_ptr); Administration_var &operator= (const Administration_var &); Administration_ptr operator-> (void) const; - + operator const Administration_ptr &() const; operator Administration_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn Administration_ptr in (void) const; Administration_ptr &inout (void); Administration_ptr &out (void); @@ -895,7 +894,7 @@ public: operator Administration_ptr &(); Administration_ptr &ptr (void); Administration_ptr operator-> (void); - + private: Administration_ptr &ptr_; }; @@ -919,12 +918,12 @@ public: static Administration_ptr _duplicate (Administration_ptr obj); static Administration_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static Administration_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static Administration_ptr _nil (void) @@ -940,7 +939,7 @@ public: class AlreadyRegistered; typedef AlreadyRegistered *AlreadyRegistered_ptr; - + #endif /* end #if !defined */ @@ -991,7 +990,7 @@ public: class CannotActivate; typedef CannotActivate *CannotActivate_ptr; - + #endif /* end #if !defined */ @@ -1046,7 +1045,7 @@ public: class NotFound; typedef NotFound *NotFound_ptr; - + #endif /* end #if !defined */ @@ -1093,7 +1092,7 @@ public: virtual void activate_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1105,7 +1104,7 @@ public: virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1116,7 +1115,7 @@ public: virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1125,7 +1124,7 @@ public: virtual void remove_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1135,7 +1134,7 @@ public: virtual void shutdown_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1147,7 +1146,7 @@ public: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1157,7 +1156,7 @@ public: virtual void server_is_shutting_down ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1168,7 +1167,7 @@ public: virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1180,7 +1179,7 @@ public: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1188,16 +1187,16 @@ public: )); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: Administration (void); - Administration (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, + Administration (TAO_Stub *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~Administration (void); @@ -1209,14 +1208,14 @@ private: class TAO_ImplementationRepository_Administration_Default_Proxy_Factory { public: - + TAO_ImplementationRepository_Administration_Default_Proxy_Factory (int register_proxy_factory = 1); - + virtual ~TAO_ImplementationRepository_Administration_Default_Proxy_Factory (void); - + virtual Administration_ptr create_proxy ( Administration_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); }; @@ -1224,23 +1223,23 @@ public: class TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter { public: - + friend class ACE_Singleton<TAO_ImplementationRepository_Administration_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; - + int register_proxy_factory ( TAO_ImplementationRepository_Administration_Default_Proxy_Factory *df, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + int unregister_proxy_factory ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + Administration_ptr create_proxy ( Administration_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); @@ -1263,7 +1262,7 @@ protected: ~TAO_ImplementationRepository_Administration_Smart_Proxy_Base (void); virtual void activate_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1275,7 +1274,7 @@ protected: virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1286,7 +1285,7 @@ protected: virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1295,7 +1294,7 @@ protected: virtual void remove_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1305,7 +1304,7 @@ protected: virtual void shutdown_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1317,7 +1316,7 @@ protected: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1327,7 +1326,7 @@ protected: virtual void server_is_shutting_down ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1338,7 +1337,7 @@ protected: virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1350,7 +1349,7 @@ protected: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1386,14 +1385,14 @@ public: ServerInformationIterator_var (ServerInformationIterator_ptr); ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor ~ServerInformationIterator_var (void); // destructor - + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); ServerInformationIterator_ptr operator-> (void) const; - + operator const ServerInformationIterator_ptr &() const; operator ServerInformationIterator_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerInformationIterator_ptr in (void) const; ServerInformationIterator_ptr &inout (void); ServerInformationIterator_ptr &out (void); @@ -1423,7 +1422,7 @@ public: operator ServerInformationIterator_ptr &(); ServerInformationIterator_ptr &ptr (void); ServerInformationIterator_ptr operator-> (void); - + private: ServerInformationIterator_ptr &ptr_; }; @@ -1447,12 +1446,12 @@ public: static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); static ServerInformationIterator_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static ServerInformationIterator_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); static ServerInformationIterator_ptr _nil (void) @@ -1465,7 +1464,7 @@ public: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1473,7 +1472,7 @@ public: )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1481,16 +1480,16 @@ public: )); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; protected: ServerInformationIterator (void); - ServerInformationIterator (TAO_Stub *objref, - TAO_ServantBase *_tao_servant = 0, + ServerInformationIterator (TAO_Stub *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~ServerInformationIterator (void); @@ -1502,14 +1501,14 @@ private: class TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory { public: - + TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (int register_proxy_factory = 1); - + virtual ~TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (void); - + virtual ServerInformationIterator_ptr create_proxy ( ServerInformationIterator_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); }; @@ -1517,23 +1516,23 @@ public: class TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter { public: - + friend class ACE_Singleton<TAO_ImplementationRepository_ServerInformationIterator_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; - + int register_proxy_factory ( TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory *df, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + int unregister_proxy_factory ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); - + ServerInformationIterator_ptr create_proxy ( ServerInformationIterator_ptr proxy, - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); @@ -1557,7 +1556,7 @@ protected: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1565,7 +1564,7 @@ protected: )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1659,7 +1658,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */ -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); diff --git a/TAO/tao/ImplRepoC.i b/TAO/tao/ImplRepoC.i index 66160e7d0c9..71caac39e89 100644 --- a/TAO/tao/ImplRepoC.i +++ b/TAO/tao/ImplRepoC.i @@ -74,14 +74,14 @@ ImplementationRepository::ServerObject_var::operator= (const ::ImplementationRep return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast +ACE_INLINE +ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast { return this->ptr_; } @@ -173,7 +173,7 @@ ImplementationRepository::ServerObject_out::operator= (ServerObject_ptr p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast { return this->ptr_; @@ -261,20 +261,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati } ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast +ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast { return this->ptr_; } @@ -291,7 +291,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::EnvironmentVariable *& ImplementationRepository::EnvironmentVariable_var::out (void) { @@ -352,7 +352,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast { return this->ptr_; @@ -372,7 +372,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_ @@ -385,24 +385,24 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0); return retval; } - + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor. { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum)) { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum, CORBA::ULong length, @@ -411,7 +411,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs) // Copy constructor. @@ -421,10 +421,10 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) { ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_); ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -432,14 +432,14 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) this->buffer_ = 0; } } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -452,18 +452,18 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) } else this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_); ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE ImplementationRepository::EnvironmentVariable & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) @@ -473,7 +473,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_); return tmp[i]; } - + ACE_INLINE const ImplementationRepository::EnvironmentVariable & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const // operator [] @@ -482,9 +482,9 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE ImplementationRepository::EnvironmentVariable * ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan) { @@ -517,13 +517,13 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) } return result; } - + ACE_INLINE const ImplementationRepository::EnvironmentVariable * ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const { return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max, CORBA::ULong length, @@ -540,11 +540,11 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_ @@ -609,27 +609,27 @@ ImplementationRepository::EnvironmentList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast +ACE_INLINE +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast +ACE_INLINE +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast +ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast { return this->ptr_; } @@ -652,7 +652,7 @@ ImplementationRepository::EnvironmentList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::EnvironmentList *& ImplementationRepository::EnvironmentList_var::out (void) { @@ -713,7 +713,7 @@ ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast { return this->ptr_; @@ -807,20 +807,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep } ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast +ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast { return this->ptr_; } @@ -837,7 +837,7 @@ ImplementationRepository::StartupOptions_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::StartupOptions *& ImplementationRepository::StartupOptions_var::out (void) { @@ -898,7 +898,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast { return this->ptr_; @@ -983,20 +983,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation } ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast { return *this->ptr_; } ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast +ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast { return this->ptr_; } @@ -1013,7 +1013,7 @@ ImplementationRepository::ServerInformation_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::ServerInformation *& ImplementationRepository::ServerInformation_var::out (void) { @@ -1074,7 +1074,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *p return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast { return this->ptr_; @@ -1094,7 +1094,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_ @@ -1107,24 +1107,24 @@ ImplementationRepository::ServerInformation_out::operator-> (void) ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0); return retval; } - + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor. { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum)) { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum, CORBA::ULong length, @@ -1133,7 +1133,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs) // Copy constructor. @@ -1143,10 +1143,10 @@ ImplementationRepository::ServerInformation_out::operator-> (void) { ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_); ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -1154,14 +1154,14 @@ ImplementationRepository::ServerInformation_out::operator-> (void) this->buffer_ = 0; } } - + ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -1174,18 +1174,18 @@ ImplementationRepository::ServerInformation_out::operator-> (void) } else this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_); ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE ImplementationRepository::ServerInformation & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) @@ -1195,7 +1195,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void) ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_); return tmp[i]; } - + ACE_INLINE const ImplementationRepository::ServerInformation & ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const // operator [] @@ -1204,9 +1204,9 @@ ImplementationRepository::ServerInformation_out::operator-> (void) ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE ImplementationRepository::ServerInformation * ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan) { @@ -1239,13 +1239,13 @@ ImplementationRepository::ServerInformation_out::operator-> (void) } return result; } - + ACE_INLINE const ImplementationRepository::ServerInformation * ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const { return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max, CORBA::ULong length, @@ -1262,11 +1262,11 @@ ImplementationRepository::ServerInformation_out::operator-> (void) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_ @@ -1331,27 +1331,27 @@ ImplementationRepository::ServerInformationList_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast +ACE_INLINE +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast { return *this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast +ACE_INLINE +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast +ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast { return this->ptr_; } @@ -1374,7 +1374,7 @@ ImplementationRepository::ServerInformationList_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::ImplementationRepository::ServerInformationList *& ImplementationRepository::ServerInformationList_var::out (void) { @@ -1435,7 +1435,7 @@ ImplementationRepository::ServerInformationList_out::operator= (ServerInformatio return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast { return this->ptr_; @@ -1529,14 +1529,14 @@ ImplementationRepository::Administration_var::operator= (const ::ImplementationR return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast +ACE_INLINE +ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast { return this->ptr_; } @@ -1628,7 +1628,7 @@ ImplementationRepository::Administration_out::operator= (Administration_ptr p) return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast { return this->ptr_; @@ -1728,14 +1728,14 @@ ImplementationRepository::ServerInformationIterator_var::operator= (const ::Impl return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationIterator_var::operator const ::ImplementationRepository::ServerInformationIterator_ptr &() const // cast { return this->ptr_; } -ACE_INLINE -ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast +ACE_INLINE +ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast { return this->ptr_; } @@ -1827,7 +1827,7 @@ ImplementationRepository::ServerInformationIterator_out::operator= (ServerInform return *this; } -ACE_INLINE +ACE_INLINE ImplementationRepository::ServerInformationIterator_out::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast { return this->ptr_; @@ -1906,7 +1906,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate) @@ -1918,7 +1918,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } @@ -1964,7 +1964,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate) @@ -1978,7 +1978,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate) @@ -1992,7 +1992,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate) @@ -2006,7 +2006,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito return 1; else return 0; - + } @@ -2247,3 +2247,4 @@ operator>> ( ACE_ENDTRY; return 0; } + diff --git a/TAO/tao/ImplRepoS.cpp b/TAO/tao/ImplRepoS.cpp index 3be0db122a5..a8233956b48 100644 --- a/TAO/tao/ImplRepoS.cpp +++ b/TAO/tao/ImplRepoS.cpp @@ -20,9 +20,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 22:04:55 */ +/* starting time is 12:16:37 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -91,10 +91,10 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, + {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, {"",0},{"",0}, - {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, + {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, {"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel}, }; @@ -113,7 +113,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch } return 0; } -/* ending time is 22:04:55 */ +/* ending time is 12:16:37 */ static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable; ImplementationRepository::ServerObject_ptr _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory ( @@ -121,7 +121,7 @@ ImplementationRepository::ServerObject_ptr _TAO_collocation_POA_ImplementationRe ) { TAO_Stub *stub = obj->_stubobj (); - + switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) { case TAO_ORB_Core::THRU_POA: @@ -145,14 +145,14 @@ ImplementationRepository::ServerObject_ptr _TAO_collocation_POA_ImplementationRe int _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer (long dummy) { ACE_UNUSED_ARG (dummy); - - _TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer = + + _TAO_collocation_ImplementationRepository_ServerObject_Stub_Factory_function_pointer = _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory; - + return 0; } -static int _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer_Scarecrow = +static int _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer_Scarecrow = _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_ServerObject_Stub_Factory_Initializer)); // skeleton constructor @@ -173,8 +173,8 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void) void POA_ImplementationRepository::ServerObject::ping_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -252,8 +252,8 @@ void POA_ImplementationRepository::ServerObject::ping_skel ( void POA_ImplementationRepository::ServerObject::shutdown_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -330,7 +330,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel ( } void POA_ImplementationRepository::ServerObject::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -342,10 +342,10 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( CORBA::String_var value; if (!((_tao_in >> value.out ()))) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -354,7 +354,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( } void POA_ImplementationRepository::ServerObject::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -363,7 +363,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -564,9 +564,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 22:04:56 */ +/* starting time is 12:16:37 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -635,27 +635,27 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const static const class TAO_operation_db_entry wordlist[] = { {"",0},{"",0},{"",0},{"",0}, - {"list", &POA_ImplementationRepository::Administration::list_skel}, + {"list", &POA_ImplementationRepository::Administration::list_skel}, {"",0},{"",0},{"",0},{"",0}, - {"find", &POA_ImplementationRepository::Administration::find_skel}, + {"find", &POA_ImplementationRepository::Administration::find_skel}, {"",0},{"",0},{"",0}, - {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, + {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, {"",0}, - {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, + {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, {"",0}, - {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, + {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, {"",0},{"",0}, - {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, + {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, {"",0}, - {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, + {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, {"",0},{"",0}, - {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, + {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, {"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, {"",0}, {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, {"",0},{"",0}, - {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, + {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -672,7 +672,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const } return 0; } -/* ending time is 22:04:56 */ +/* ending time is 12:16:37 */ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable; ImplementationRepository::Administration_ptr _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory ( @@ -680,7 +680,7 @@ ImplementationRepository::Administration_ptr _TAO_collocation_POA_Implementation ) { TAO_Stub *stub = obj->_stubobj (); - + switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) { case TAO_ORB_Core::THRU_POA: @@ -704,14 +704,14 @@ ImplementationRepository::Administration_ptr _TAO_collocation_POA_Implementation int _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer (long dummy) { ACE_UNUSED_ARG (dummy); - - _TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer = + + _TAO_collocation_ImplementationRepository_Administration_Stub_Factory_function_pointer = _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory; - + return 0; } -static int _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer_Scarecrow = +static int _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer_Scarecrow = _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_Administration_Stub_Factory_Initializer)); // skeleton constructor @@ -732,8 +732,8 @@ POA_ImplementationRepository::Administration::~Administration (void) void POA_ImplementationRepository::Administration::activate_server_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -819,8 +819,8 @@ void POA_ImplementationRepository::Administration::activate_server_skel ( void POA_ImplementationRepository::Administration::register_server_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -909,8 +909,8 @@ void POA_ImplementationRepository::Administration::register_server_skel ( void POA_ImplementationRepository::Administration::reregister_server_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -999,8 +999,8 @@ void POA_ImplementationRepository::Administration::reregister_server_skel ( void POA_ImplementationRepository::Administration::remove_server_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1086,8 +1086,8 @@ void POA_ImplementationRepository::Administration::remove_server_skel ( void POA_ImplementationRepository::Administration::shutdown_server_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1173,8 +1173,8 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel ( void POA_ImplementationRepository::Administration::server_is_running_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1273,8 +1273,8 @@ void POA_ImplementationRepository::Administration::server_is_running_skel ( void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1360,8 +1360,8 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel void POA_ImplementationRepository::Administration::find_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1455,8 +1455,8 @@ void POA_ImplementationRepository::Administration::find_skel ( void POA_ImplementationRepository::Administration::list_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -1552,7 +1552,7 @@ void POA_ImplementationRepository::Administration::list_skel ( } void POA_ImplementationRepository::Administration::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -1564,10 +1564,10 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( CORBA::String_var value; if (!((_tao_in >> value.out ()))) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -1576,7 +1576,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel ( } void POA_ImplementationRepository::Administration::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -1585,7 +1585,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel ( POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -2017,9 +2017,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 22:04:56 */ +/* starting time is 12:16:37 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /home/coryan/subsets/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -2089,8 +2089,8 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo { {"",0},{"",0},{"",0},{"",0},{"",0}, {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, - {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, - {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, + {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, + {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, {"",0},{"",0},{"",0},{"",0},{"",0}, {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel}, }; @@ -2109,7 +2109,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo } return 0; } -/* ending time is 22:04:56 */ +/* ending time is 12:16:37 */ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable; ImplementationRepository::ServerInformationIterator_ptr _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory ( @@ -2117,7 +2117,7 @@ ImplementationRepository::ServerInformationIterator_ptr _TAO_collocation_POA_Imp ) { TAO_Stub *stub = obj->_stubobj (); - + switch (stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()) { case TAO_ORB_Core::THRU_POA: @@ -2141,14 +2141,14 @@ ImplementationRepository::ServerInformationIterator_ptr _TAO_collocation_POA_Imp int _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer (long dummy) { ACE_UNUSED_ARG (dummy); - - _TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer = + + _TAO_collocation_ImplementationRepository_ServerInformationIterator_Stub_Factory_function_pointer = _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory; - + return 0; } -static int _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer_Scarecrow = +static int _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer_Scarecrow = _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_ImplementationRepository_ServerInformationIterator_Stub_Factory_Initializer)); // skeleton constructor @@ -2169,8 +2169,8 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -2266,8 +2266,8 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( CORBA::ServerRequest &_tao_server_request, - void *_tao_object_reference, - void * /* context */, + void *_tao_object_reference, + void * /* context */, CORBA::Environment &ACE_TRY_ENV ) { @@ -2344,7 +2344,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( } void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -2356,10 +2356,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( CORBA::String_var value; if (!((_tao_in >> value.out ()))) ACE_THROW (CORBA::MARSHAL ()); - + _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -2368,7 +2368,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( } void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel ( - CORBA::ServerRequest &_tao_server_request, + CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -2377,7 +2377,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); ACE_CHECK; - + _tao_server_request.init_reply (ACE_TRY_ENV); ACE_CHECK; TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); @@ -2574,3 +2574,6 @@ void POA_ImplementationRepository::_tao_thru_poa_collocated_ServerInformationIte ); return; } + + + diff --git a/TAO/tao/ImplRepoS.h b/TAO/tao/ImplRepoS.h index d7ade677149..39c124dc329 100644 --- a/TAO/tao/ImplRepoS.h +++ b/TAO/tao/ImplRepoS.h @@ -40,7 +40,7 @@ TAO_NAMESPACE POA_ImplementationRepository virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -52,7 +52,7 @@ TAO_NAMESPACE POA_ImplementationRepository CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -60,26 +60,26 @@ TAO_NAMESPACE POA_ImplementationRepository CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); ::ImplementationRepository::ServerObject *_this ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -87,15 +87,15 @@ TAO_NAMESPACE POA_ImplementationRepository )) = 0; static void ping_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -103,10 +103,10 @@ TAO_NAMESPACE POA_ImplementationRepository )) = 0; static void shutdown_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -127,13 +127,13 @@ TAO_NAMESPACE POA_ImplementationRepository const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual CORBA::Boolean _non_existent( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -141,7 +141,7 @@ TAO_NAMESPACE POA_ImplementationRepository )); virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -153,7 +153,7 @@ TAO_NAMESPACE POA_ImplementationRepository #endif /* end #if !defined */ - + #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> @@ -170,7 +170,7 @@ TAO_NAMESPACE POA_ImplementationRepository // ctor with T*, ownership flag and a POA ~ServerObject_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -182,14 +182,14 @@ TAO_NAMESPACE POA_ImplementationRepository // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -197,7 +197,7 @@ TAO_NAMESPACE POA_ImplementationRepository )); void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -208,7 +208,7 @@ private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ServerObject_tie (const ServerObject_tie &); void operator= (const ServerObject_tie &); @@ -230,7 +230,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -242,7 +242,7 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -250,19 +250,19 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); ::ImplementationRepository::Administration *_this ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -270,7 +270,7 @@ private: virtual void activate_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -280,17 +280,17 @@ private: )) = 0; static void activate_server_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -299,17 +299,17 @@ private: )) = 0; static void register_server_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -317,16 +317,16 @@ private: )) = 0; static void reregister_server_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void remove_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -335,16 +335,16 @@ private: )) = 0; static void remove_server_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void shutdown_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -353,10 +353,10 @@ private: )) = 0; static void shutdown_server_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -364,7 +364,7 @@ private: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -373,16 +373,16 @@ private: )) = 0; static void server_is_running_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void server_is_shutting_down ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -391,17 +391,17 @@ private: )) = 0; static void server_is_shutting_down_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -410,10 +410,10 @@ private: )) = 0; static void find_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -421,7 +421,7 @@ private: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -429,10 +429,10 @@ private: )) = 0; static void list_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -453,14 +453,14 @@ private: const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual CORBA::Boolean _non_existent( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual void activate_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -472,7 +472,7 @@ private: virtual void register_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -483,7 +483,7 @@ private: virtual void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -492,7 +492,7 @@ private: virtual void remove_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -502,7 +502,7 @@ private: virtual void shutdown_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -514,7 +514,7 @@ private: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -524,7 +524,7 @@ private: virtual void server_is_shutting_down ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -535,7 +535,7 @@ private: virtual void find ( const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -547,7 +547,7 @@ private: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -559,7 +559,7 @@ private: #endif /* end #if !defined */ - + #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> @@ -576,7 +576,7 @@ private: // ctor with T*, ownership flag and a POA ~Administration_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -588,15 +588,15 @@ private: // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); void activate_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -608,7 +608,7 @@ private: void register_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -619,7 +619,7 @@ private: void reregister_server ( const char * server, const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -628,7 +628,7 @@ private: void remove_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -638,7 +638,7 @@ private: void shutdown_server ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -650,7 +650,7 @@ private: const char * server, const char * addr, ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -660,7 +660,7 @@ private: void server_is_shutting_down ( const char * server, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -671,7 +671,7 @@ private: void find ( const char * server, ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -683,7 +683,7 @@ private: CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -694,7 +694,7 @@ private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed Administration_tie (const Administration_tie &); void operator= (const Administration_tie &); @@ -716,7 +716,7 @@ private: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -728,7 +728,7 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -736,19 +736,19 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); ::ImplementationRepository::ServerInformationIterator *_this ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -757,7 +757,7 @@ private: virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -765,15 +765,15 @@ private: )) = 0; static void next_n_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -781,10 +781,10 @@ private: )) = 0; static void destroy_skel ( - CORBA::ServerRequest &_tao_req, - void *_tao_obj, - void *_tao_context, - CORBA::Environment &ACE_TRY_ENV = + CORBA::ServerRequest &_tao_req, + void *_tao_obj, + void *_tao_context, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -805,15 +805,15 @@ private: const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual CORBA::Boolean _non_existent( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -821,7 +821,7 @@ private: )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -833,7 +833,7 @@ private: #endif /* end #if !defined */ - + #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> @@ -850,7 +850,7 @@ private: // ctor with T*, ownership flag and a POA ~ServerInformationIterator_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object @@ -862,16 +862,16 @@ private: // do we own it void _is_owner (CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &env = TAO_default_environment () ); CORBA::Boolean next_n ( CORBA::ULong how_many, ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -879,7 +879,7 @@ private: )); void destroy ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -890,7 +890,7 @@ private: T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; - + // copy and assignment are not allowed ServerInformationIterator_tie (const ServerInformationIterator_tie &); void operator= (const ServerInformationIterator_tie &); diff --git a/TAO/tao/ImplRepoS.i b/TAO/tao/ImplRepoS.i index 9386d854853..d41d475fa1a 100644 --- a/TAO/tao/ImplRepoS.i +++ b/TAO/tao/ImplRepoS.i @@ -6,3 +6,4 @@ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html + diff --git a/TAO/tao/ImplRepoS_T.i b/TAO/tao/ImplRepoS_T.i index 25f991dfc5d..c9f070e9a57 100644 --- a/TAO/tao/ImplRepoS_T.i +++ b/TAO/tao/ImplRepoS_T.i @@ -11,30 +11,30 @@ #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -117,30 +117,30 @@ void POA_ImplementationRepository::ServerObject_tie<T>::shutdown ( #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE @@ -354,30 +354,30 @@ void POA_ImplementationRepository::Administration_tie<T>::list ( #if defined (ACE_HAS_USING_KEYWORD) template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t) - : ptr_ (&t), - poa_ (PortableServer::POA::_nil ()), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_nil ()), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa) - : ptr_ (&t), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (0) + : ptr_ (&t), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (0) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_nil ()), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_nil ()), + rel_ (release) {} template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release) - : ptr_ (tp), - poa_ (PortableServer::POA::_duplicate (poa)), - rel_ (release) + : ptr_ (tp), + poa_ (PortableServer::POA::_duplicate (poa)), + rel_ (release) {} template <class T> ACE_INLINE diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp index 4119d134bfa..8f6c69e5fd2 100644 --- a/TAO/tao/InterceptorC.cpp +++ b/TAO/tao/InterceptorC.cpp @@ -60,7 +60,7 @@ PortableInterceptor::Cookie::_duplicate (PortableInterceptor::Cookie_ptr obj) void PortableInterceptor::Cookie::_tao_any_destructor (void *x) { - PortableInterceptor::Cookie* tmp = ACE_const_cast (PortableInterceptor::Cookie*,x); + PortableInterceptor::Cookie *tmp = ACE_static_cast (PortableInterceptor::Cookie*,x); CORBA::release (tmp); } @@ -360,7 +360,7 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (PortableInterceptor:: void PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *x) { - PortableInterceptor::ServerRequestInterceptor* tmp = ACE_const_cast (PortableInterceptor::ServerRequestInterceptor*,x); + PortableInterceptor::ServerRequestInterceptor *tmp = ACE_static_cast (PortableInterceptor::ServerRequestInterceptor*,x); CORBA::release (tmp); } @@ -435,7 +435,7 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (PortableInterceptor:: void PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *x) { - PortableInterceptor::ClientRequestInterceptor* tmp = ACE_const_cast (PortableInterceptor::ClientRequestInterceptor*,x); + PortableInterceptor::ClientRequestInterceptor *tmp = ACE_static_cast (PortableInterceptor::ClientRequestInterceptor*,x); CORBA::release (tmp); } diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 8378ec71192..087299ff73b 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -102,7 +102,6 @@ DEFAULT_RESOURCES_FILES = \ INTERPRETIVE_MARSHALING_FILES = \ append \ - deep_free \ CDR_Interpreter \ Marshal \ skip diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index 611c5e9e127..3539aae6dfb 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -34,12 +34,6 @@ class TAO_OutputCDR; class TAO_InputCDR; -CORBA::TypeCode::traverse_status -DEEP_FREE (CORBA::TypeCode_ptr param, - const void *source, - const void *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - // = Forward declarations. class TAO_Marshal_Object; class TAO_Marshal_Primitive; @@ -108,8 +102,8 @@ class TAO_Export TAO_Marshal_Object // The Marshaling object that provides a common interface to the // CDR object for marshaling different IDL data types // - // Provides a set of virtual methods for encoding, decoding - // and deep_freeing. + // Provides a set of virtual methods for appending and skipping + // data over a CDR stream. public: virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, @@ -140,10 +134,6 @@ public: virtual ~TAO_Marshal_Primitive (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -168,10 +158,6 @@ public: virtual ~TAO_Marshal_Any (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *source, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -196,10 +182,6 @@ public: virtual ~TAO_Marshal_TypeCode (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -224,10 +206,6 @@ public: virtual ~TAO_Marshal_Principal (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -252,10 +230,6 @@ public: virtual ~TAO_Marshal_ObjRef (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -280,10 +254,6 @@ public: virtual ~TAO_Marshal_Struct (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -308,10 +278,6 @@ public: virtual ~TAO_Marshal_Union (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -336,10 +302,6 @@ public: virtual ~TAO_Marshal_String (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -364,10 +326,6 @@ public: virtual ~TAO_Marshal_Sequence (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -392,10 +350,6 @@ public: virtual ~TAO_Marshal_Array (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -420,10 +374,6 @@ public: virtual ~TAO_Marshal_Alias (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -447,10 +397,6 @@ public: TAO_Marshal_Except (void); ~TAO_Marshal_Except (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); @@ -474,10 +420,6 @@ public: TAO_Marshal_WString (void); ~TAO_Marshal_WString (void); - static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i index 1d95143e76d..9ee1717db49 100644 --- a/TAO/tao/Marshal.i +++ b/TAO/tao/Marshal.i @@ -138,74 +138,3 @@ ACE_INLINE TAO_Marshal_WString::~TAO_Marshal_WString (void) { } - -// *************** deep_free methods ****************** - -// deep_free for Any -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_Any::deep_free (CORBA::TypeCode_ptr, - const void *source, - const void *, - CORBA::Environment &) -{ - ((CORBA::Any *) source)->~CORBA_Any (); - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for TypeCode -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_TypeCode::deep_free (CORBA::TypeCode_ptr, - const void *source, - const void *, - CORBA::Environment &) -{ - CORBA::release (*(CORBA::TypeCode_ptr *) source); - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for Principal -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_Principal::deep_free (CORBA::TypeCode_ptr, - const void *value, - const void *, - CORBA::Environment &) -{ - CORBA::release (*(CORBA::Principal_ptr *) value); - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for ObjRef -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_ObjRef::deep_free (CORBA::TypeCode_ptr, - const void *source, - const void *, - CORBA::Environment &) -{ - CORBA::Object_ptr obj = *(CORBA::Object_ptr *)source; - CORBA::release (obj); - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for string -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_String::deep_free (CORBA::TypeCode_ptr, - const void *source, - const void *, - CORBA::Environment &) -{ - CORBA::string_free (*(CORBA::Char* *) source); - *(CORBA::Char* *)source = 0; - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for wstring -ACE_INLINE CORBA::TypeCode::traverse_status -TAO_Marshal_WString::deep_free (CORBA::TypeCode_ptr, - const void *source, - const void *, - CORBA::Environment &) -{ - CORBA::wstring_free (*(CORBA::WChar* *) source); - *(CORBA::WChar* *)source = 0; - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 1f359f8693e..0c95698fbca 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -158,7 +158,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_t void PortableServer::ForwardRequest::_tao_any_destructor (void *x) { - PortableServer::ForwardRequest *tmp = ACE_const_cast(PortableServer::ForwardRequest*,x); + PortableServer::ForwardRequest *tmp = ACE_static_cast(PortableServer::ForwardRequest*,x); delete tmp; } @@ -3360,7 +3360,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicy_ptr _tao_el void PortableServer::ThreadPolicy::_tao_any_destructor (void *x) { - PortableServer::ThreadPolicy *tmp = ACE_const_cast(PortableServer::ThreadPolicy*,x); + PortableServer::ThreadPolicy *tmp = ACE_static_cast(PortableServer::ThreadPolicy*,x); CORBA::release (tmp); } @@ -3458,7 +3458,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicy_ptr _tao_ void PortableServer::LifespanPolicy::_tao_any_destructor (void *x) { - PortableServer::LifespanPolicy *tmp = ACE_const_cast(PortableServer::LifespanPolicy*,x); + PortableServer::LifespanPolicy *tmp = ACE_static_cast(PortableServer::LifespanPolicy*,x); CORBA::release (tmp); } @@ -3554,7 +3554,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicy_ptr _ void PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *x) { - PortableServer::IdUniquenessPolicy *tmp = ACE_const_cast(PortableServer::IdUniquenessPolicy*,x); + PortableServer::IdUniquenessPolicy *tmp = ACE_static_cast(PortableServer::IdUniquenessPolicy*,x); CORBA::release (tmp); } @@ -3650,7 +3650,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicy_ptr _ void PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *x) { - PortableServer::IdAssignmentPolicy *tmp = ACE_const_cast(PortableServer::IdAssignmentPolicy*,x); + PortableServer::IdAssignmentPolicy *tmp = ACE_static_cast(PortableServer::IdAssignmentPolicy*,x); CORBA::release (tmp); } @@ -3748,7 +3748,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicy void PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *x) { - PortableServer::ImplicitActivationPolicy *tmp = ACE_const_cast(PortableServer::ImplicitActivationPolicy*,x); + PortableServer::ImplicitActivationPolicy *tmp = ACE_static_cast(PortableServer::ImplicitActivationPolicy*,x); CORBA::release (tmp); } @@ -3844,7 +3844,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicy_p void PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *x) { - PortableServer::ServantRetentionPolicy *tmp = ACE_const_cast(PortableServer::ServantRetentionPolicy*,x); + PortableServer::ServantRetentionPolicy *tmp = ACE_static_cast(PortableServer::ServantRetentionPolicy*,x); CORBA::release (tmp); } @@ -3940,7 +3940,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicy_ void PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *x) { - PortableServer::RequestProcessingPolicy *tmp = ACE_const_cast(PortableServer::RequestProcessingPolicy*,x); + PortableServer::RequestProcessingPolicy *tmp = ACE_static_cast(PortableServer::RequestProcessingPolicy*,x); CORBA::release (tmp); } @@ -3998,7 +3998,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterAlread void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *x) { - PortableServer::POA::AdapterAlreadyExists *tmp = ACE_const_cast(PortableServer::POA::AdapterAlreadyExists*,x); + PortableServer::POA::AdapterAlreadyExists *tmp = ACE_static_cast(PortableServer::POA::AdapterAlreadyExists*,x); delete tmp; } @@ -4131,7 +4131,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterInacti void PortableServer::POA::AdapterInactive::_tao_any_destructor (void *x) { - PortableServer::POA::AdapterInactive *tmp = ACE_const_cast(PortableServer::POA::AdapterInactive*,x); + PortableServer::POA::AdapterInactive *tmp = ACE_static_cast(PortableServer::POA::AdapterInactive*,x); delete tmp; } @@ -4264,7 +4264,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterNonExi void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *x) { - PortableServer::POA::AdapterNonExistent *tmp = ACE_const_cast(PortableServer::POA::AdapterNonExistent*,x); + PortableServer::POA::AdapterNonExistent *tmp = ACE_static_cast(PortableServer::POA::AdapterNonExistent*,x); delete tmp; } @@ -4395,7 +4395,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::InvalidPolicy void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *x) { - PortableServer::POA::InvalidPolicy *tmp = ACE_const_cast(PortableServer::POA::InvalidPolicy*,x); + PortableServer::POA::InvalidPolicy *tmp = ACE_static_cast(PortableServer::POA::InvalidPolicy*,x); delete tmp; } @@ -4528,7 +4528,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::NoServant &_t void PortableServer::POA::NoServant::_tao_any_destructor (void *x) { - PortableServer::POA::NoServant *tmp = ACE_const_cast(PortableServer::POA::NoServant*,x); + PortableServer::POA::NoServant *tmp = ACE_static_cast(PortableServer::POA::NoServant*,x); delete tmp; } @@ -4661,7 +4661,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlready void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *x) { - PortableServer::POA::ObjectAlreadyActive *tmp = ACE_const_cast(PortableServer::POA::ObjectAlreadyActive*,x); + PortableServer::POA::ObjectAlreadyActive *tmp = ACE_static_cast(PortableServer::POA::ObjectAlreadyActive*,x); delete tmp; } @@ -4681,12 +4681,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::ObjectAlreadyActive *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlreadyActive *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_ObjectAlreadyActive, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4697,43 +4702,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectAlreadyActive, 0); + PortableServer::POA::ObjectAlreadyActive *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::ObjectAlreadyActive, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_ObjectAlreadyActive, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlreadyActive *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::ObjectAlreadyActive *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActive &_tao_elem) // copying { TAO_OutputCDR stream; @@ -4747,7 +4745,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActi void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *x) { - PortableServer::POA::ObjectNotActive *tmp = ACE_const_cast(PortableServer::POA::ObjectNotActive*,x); + PortableServer::POA::ObjectNotActive *tmp = ACE_static_cast(PortableServer::POA::ObjectNotActive*,x); delete tmp; } @@ -4767,12 +4765,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *_t CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::ObjectNotActive *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActive *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_ObjectNotActive, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4783,43 +4786,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectNotActive, 0); + PortableServer::POA::ObjectNotActive *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::ObjectNotActive, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_ObjectNotActive, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::ObjectNotActive::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActive *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::ObjectNotActive *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlreadyActive &_tao_elem) // copying { TAO_OutputCDR stream; @@ -4833,7 +4829,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlread void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *x) { - PortableServer::POA::ServantAlreadyActive *tmp = ACE_const_cast(PortableServer::POA::ServantAlreadyActive*,x); + PortableServer::POA::ServantAlreadyActive *tmp = ACE_static_cast(PortableServer::POA::ServantAlreadyActive*,x); delete tmp; } @@ -4853,12 +4849,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActiv CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActive *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::ServantAlreadyActive *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ServantAlreadyActive *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_ServantAlreadyActive, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4869,43 +4870,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantAlreadyActive, 0); + PortableServer::POA::ServantAlreadyActive *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::ServantAlreadyActive, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_ServantAlreadyActive, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::ServantAlreadyActive::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ServantAlreadyActive *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::ServantAlreadyActive *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotActive &_tao_elem) // copying { TAO_OutputCDR stream; @@ -4919,7 +4913,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotAct void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *x) { - PortableServer::POA::ServantNotActive *tmp = ACE_const_cast(PortableServer::POA::ServantNotActive*,x); + PortableServer::POA::ServantNotActive *tmp = ACE_static_cast(PortableServer::POA::ServantNotActive*,x); delete tmp; } @@ -4939,12 +4933,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *_ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::ServantNotActive *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ServantNotActive *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_ServantNotActive, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -4955,43 +4954,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantNotActive, 0); + PortableServer::POA::ServantNotActive *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::ServantNotActive, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_ServantNotActive, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::ServantNotActive::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::ServantNotActive *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::ServantNotActive *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter &_tao_elem) // copying { TAO_OutputCDR stream; @@ -5005,7 +4997,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *x) { - PortableServer::POA::WrongAdapter *tmp = ACE_const_cast(PortableServer::POA::WrongAdapter*,x); + PortableServer::POA::WrongAdapter *tmp = ACE_static_cast(PortableServer::POA::WrongAdapter*,x); delete tmp; } @@ -5025,12 +5017,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *_tao_ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::WrongAdapter *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_WrongAdapter, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -5041,43 +5038,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongAdapter, 0); + PortableServer::POA::WrongAdapter *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::WrongAdapter, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_WrongAdapter, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::WrongAdapter::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::WrongAdapter *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy &_tao_elem) // copying { TAO_OutputCDR stream; @@ -5091,7 +5081,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy & void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *x) { - PortableServer::POA::WrongPolicy *tmp = ACE_const_cast(PortableServer::POA::WrongPolicy*,x); + PortableServer::POA::WrongPolicy *tmp = ACE_static_cast(PortableServer::POA::WrongPolicy*,x); delete tmp; } @@ -5111,12 +5101,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *_tao_e CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POA::WrongPolicy *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POA::_tc_WrongPolicy, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -5127,43 +5122,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongPolicy, 0); + PortableServer::POA::WrongPolicy *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POA::WrongPolicy, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POA::_tc_WrongPolicy, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POA::WrongPolicy::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POA::WrongPolicy *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext &_tao_elem) // copying { TAO_OutputCDR stream; @@ -5177,7 +5165,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext void PortableServer::Current::NoContext::_tao_any_destructor (void *x) { - PortableServer::Current::NoContext *tmp = ACE_const_cast(PortableServer::Current::NoContext*,x); + PortableServer::Current::NoContext *tmp = ACE_static_cast(PortableServer::Current::NoContext*,x); delete tmp; } @@ -5197,12 +5185,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::Current::NoContext *_tao CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current::NoContext *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::Current::NoContext *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Current::NoContext *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::Current::_tc_NoContext, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -5213,43 +5206,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current: } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::Current::NoContext, 0); + PortableServer::Current::NoContext *tmp; + ACE_NEW_RETURN (tmp, PortableServer::Current::NoContext, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::Current::_tc_NoContext, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::Current::NoContext::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Current::NoContext *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::Current::NoContext *&,_tao_elem); -} - void operator<<= (CORBA::Any &_tao_any, PortableServer::Current_ptr _tao_elem) { TAO_OutputCDR stream; @@ -5265,7 +5251,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::Current_ptr _tao_elem) void PortableServer::Current::_tao_any_destructor (void *x) { - PortableServer::Current *tmp = ACE_const_cast(PortableServer::Current*,x); + PortableServer::Current *tmp = ACE_static_cast(PortableServer::Current*,x); CORBA::release (tmp); } @@ -5323,7 +5309,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POAManager_ptr _tao_elem void PortableServer::POAManager::_tao_any_destructor (void *x) { - PortableServer::POAManager *tmp = ACE_const_cast(PortableServer::POAManager*,x); + PortableServer::POAManager *tmp = ACE_static_cast(PortableServer::POAManager*,x); CORBA::release (tmp); } @@ -5417,7 +5403,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POAManager::Adapte void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *x) { - PortableServer::POAManager::AdapterInactive *tmp = ACE_const_cast(PortableServer::POAManager::AdapterInactive*,x); + PortableServer::POAManager::AdapterInactive *tmp = ACE_static_cast(PortableServer::POAManager::AdapterInactive*,x); delete tmp; } @@ -5437,12 +5423,17 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInact CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInactive *&_tao_elem) { + return _tao_any >>= ACE_const_cast(const PortableServer::POAManager::AdapterInactive *&,_tao_elem); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POAManager::AdapterInactive *&_tao_elem) +{ + _tao_elem = 0; ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); if (!type->equivalent (PortableServer::POAManager::_tc_AdapterInactive, ACE_TRY_ENV)) // not equal { - _tao_elem = 0; return 0; } ACE_TRY_CHECK; @@ -5453,43 +5444,36 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManag } else { - ACE_NEW_RETURN (_tao_elem, PortableServer::POAManager::AdapterInactive, 0); + PortableServer::POAManager::AdapterInactive *tmp; + ACE_NEW_RETURN (tmp, PortableServer::POAManager::AdapterInactive, 0); TAO_InputCDR stream ( _tao_any._tao_get_cdr (), _tao_any._tao_byte_order () ); - if (stream >> *_tao_elem) + if (stream >> *tmp) { ((CORBA::Any *)&_tao_any)->_tao_replace ( PortableServer::POAManager::_tc_AdapterInactive, 1, - ACE_reinterpret_cast (void *, _tao_elem), + ACE_reinterpret_cast (void *, tmp), PortableServer::POAManager::AdapterInactive::_tao_any_destructor ); + _tao_elem = tmp; return 1; } else { - delete _tao_elem; - _tao_elem = 0; + delete tmp; } } } ACE_CATCHANY { - delete _tao_elem; - _tao_elem = 0; - return 0; } ACE_ENDTRY; return 0; } -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::POAManager::AdapterInactive *&_tao_elem) -{ - return _tao_any >>= ACE_const_cast(PortableServer::POAManager::AdapterInactive *&,_tao_elem); -} - #if (TAO_HAS_MINIMUM_POA == 0) void operator<<= (CORBA::Any &_tao_any, PortableServer::AdapterActivator_ptr _tao_elem) @@ -5507,7 +5491,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::AdapterActivator_ptr _ta void PortableServer::AdapterActivator::_tao_any_destructor (void *x) { - PortableServer::AdapterActivator *tmp = ACE_const_cast(PortableServer::AdapterActivator*,x); + PortableServer::AdapterActivator *tmp = ACE_static_cast(PortableServer::AdapterActivator*,x); CORBA::release (tmp); } @@ -5565,7 +5549,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantLocator_ptr _tao_ void PortableServer::ServantLocator::_tao_any_destructor (void *x) { - PortableServer::ServantLocator *tmp = ACE_const_cast(PortableServer::ServantLocator*,x); + PortableServer::ServantLocator *tmp = ACE_static_cast(PortableServer::ServantLocator*,x); CORBA::release (tmp); } @@ -5623,7 +5607,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantManager_ptr _tao_ void PortableServer::ServantManager::_tao_any_destructor (void *x) { - PortableServer::ServantManager *tmp = ACE_const_cast(PortableServer::ServantManager*,x); + PortableServer::ServantManager *tmp = ACE_static_cast(PortableServer::ServantManager*,x); CORBA::release (tmp); } @@ -5681,7 +5665,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantActivator_ptr _ta void PortableServer::ServantActivator::_tao_any_destructor (void *x) { - PortableServer::ServantActivator *tmp = ACE_const_cast(PortableServer::ServantActivator*,x); + PortableServer::ServantActivator *tmp = ACE_static_cast(PortableServer::ServantActivator*,x); CORBA::release (tmp); } @@ -5741,7 +5725,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA_ptr _tao_elem) void PortableServer::POA::_tao_any_destructor (void *x) { - PortableServer::POA *tmp = ACE_const_cast(PortableServer::POA*,x); + PortableServer::POA *tmp = ACE_static_cast(PortableServer::POA*,x); CORBA::release (tmp); } diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 92100428d95..bdd93d93a04 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -621,7 +621,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // void CORBA::PolicyError::_tao_any_destructor (void *x) { - CORBA::PolicyError *tmp = ACE_const_cast(CORBA::PolicyError*,x); + CORBA::PolicyError *tmp = ACE_static_cast(CORBA::PolicyError*,x); delete tmp; } @@ -752,7 +752,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::InvalidPolicies &_tao_elem) void CORBA::InvalidPolicies::_tao_any_destructor (void *x) { - CORBA::InvalidPolicies *tmp = ACE_const_cast(CORBA::InvalidPolicies*,x); + CORBA::InvalidPolicies *tmp = ACE_static_cast(CORBA::InvalidPolicies*,x); delete tmp; } @@ -872,7 +872,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InvalidPoli void CORBA::Policy::_tao_any_destructor (void *x) { - CORBA::Policy *tmp = ACE_const_cast(CORBA::Policy*,x); + CORBA::Policy *tmp = ACE_static_cast(CORBA::Policy*,x); CORBA::release (tmp); } @@ -954,7 +954,7 @@ void operator<<= ( void CORBA::PolicyList::_tao_any_destructor (void *x) { - CORBA::PolicyList *tmp = ACE_const_cast(CORBA::PolicyList*,x); + CORBA::PolicyList *tmp = ACE_static_cast(CORBA::PolicyList*,x); delete tmp; } @@ -1090,7 +1090,7 @@ void operator<<= ( void CORBA::PolicyTypeSeq::_tao_any_destructor (void *x) { - CORBA::PolicyTypeSeq *tmp = ACE_const_cast(CORBA::PolicyTypeSeq*,x); + CORBA::PolicyTypeSeq *tmp = ACE_static_cast(CORBA::PolicyTypeSeq*,x); delete tmp; } @@ -1288,7 +1288,7 @@ operator>> ( void CORBA::PolicyManager::_tao_any_destructor (void *x) { - CORBA::PolicyManager *tmp = ACE_const_cast(CORBA::PolicyManager*,x); + CORBA::PolicyManager *tmp = ACE_static_cast(CORBA::PolicyManager*,x); CORBA::release (tmp); } @@ -1349,7 +1349,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyManager_ptr void CORBA::PolicyCurrent::_tao_any_destructor (void *x) { - CORBA::PolicyCurrent *tmp = ACE_const_cast(CORBA::PolicyCurrent*,x); + CORBA::PolicyCurrent *tmp = ACE_static_cast(CORBA::PolicyCurrent*,x); CORBA::release (tmp); } diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 922a0ec5ac4..70d3f875b52 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -156,7 +156,7 @@ void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_e void TAO::PrioritySpecification::_tao_any_destructor (void *x) { - TAO::PrioritySpecification *tmp = ACE_const_cast(TAO::PrioritySpecification*,x); + TAO::PrioritySpecification *tmp = ACE_static_cast(TAO::PrioritySpecification*,x); delete tmp; } @@ -276,7 +276,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::PrioritySpeci void TAO::ClientPriorityPolicy::_tao_any_destructor (void *x) { - TAO::ClientPriorityPolicy *tmp = ACE_const_cast(TAO::ClientPriorityPolicy*,x); + TAO::ClientPriorityPolicy *tmp = ACE_static_cast(TAO::ClientPriorityPolicy*,x); CORBA::release (tmp); } @@ -498,7 +498,7 @@ void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_ele void TAO::BufferingConstraint::_tao_any_destructor (void *x) { - TAO::BufferingConstraint *tmp = ACE_const_cast(TAO::BufferingConstraint*,x); + TAO::BufferingConstraint *tmp = ACE_static_cast(TAO::BufferingConstraint*,x); delete tmp; } @@ -618,7 +618,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingCons void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *x) { - TAO::BufferingConstraintPolicy *tmp = ACE_const_cast(TAO::BufferingConstraintPolicy*,x); + TAO::BufferingConstraintPolicy *tmp = ACE_static_cast(TAO::BufferingConstraintPolicy*,x); CORBA::release (tmp); } diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp deleted file mode 100644 index d5fcae12cb2..00000000000 --- a/TAO/tao/deep_free.cpp +++ /dev/null @@ -1,810 +0,0 @@ -// ============================================================================ -// -// $Id$ -// -// = LIBRARY -// TAO -// -// = FILENAME -// deep_free.cpp -// -// = DESCRIPTION -// Code for deep_free -// The original code had a single static deep_free function that called -// traverse to interpret the data types. This version defines a static method -// "deep_free" on each class and avoids calling traverse. -// -// Helper routine for "Any" destructor. -// -// This frees all the memory pointed to by any given value held inside -// of an "Any". For most data types it does nothing, since most data -// types don't hold any memory. For a few, it calls other deep_free methods -// to free the memory -// -// = AUTHOR -// Copyright 1994-1995 by Sun Microsystems Inc. -// and -// Aniruddha Gokhale -// -// ============================================================================ - -#include "tao/Marshal.h" -#include "tao/CDR.h" -#include "tao/Environment.h" -#include "tao/Any.h" -#include "tao/Object.h" -#include "tao/Stub.h" -#include "tao/Principal.h" -#include "tao/varout.h" -#include "tao/Union.h" -#include "tao/debug.h" - -ACE_RCSID(tao, deep_free, "$Id$") - -CORBA::TypeCode::traverse_status -DEEP_FREE (CORBA::TypeCode_ptr param, - const void *source, - const void *dest, - CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - - // Since every exception-throwing function is followed by break and then return, - // we'll just skip the checking here. - switch (param->kind_) - { - case CORBA::tk_null: - case CORBA::tk_void: - case CORBA::tk_short: - case CORBA::tk_ushort: - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_boolean: - case CORBA::tk_char: - case CORBA::tk_octet: - case CORBA::tk_longdouble: - case CORBA::tk_wchar: - break; - case CORBA::tk_any: - retval = TAO_Marshal_Any::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_TypeCode: - retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_Principal: - retval = TAO_Marshal_Principal::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_objref: - retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_struct: - retval = TAO_Marshal_Struct::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_union: - retval = TAO_Marshal_Union::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_string: - retval = TAO_Marshal_String::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_sequence: - retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV); - // @@ (JP) This takes care of a memory leak we had for recursive unions - // and unions that contain an anonymous sequence. For unions that contain - // typedef'd sequences and other cases where the union member is a - // pointer, we still have leaks. These are not so easy to fix for all - // cases. What we need is Carlos' _tao_destroy() method in the stubs. - delete ACE_reinterpret_cast (TAO_Base_Sequence *, - ACE_const_cast (void *, - source)); - break; - case CORBA::tk_array: - retval = TAO_Marshal_Array::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_alias: - retval = TAO_Marshal_Alias::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_except: - retval = TAO_Marshal_Except::deep_free (param, source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_wstring: - retval = TAO_Marshal_WString::deep_free (param, source, dest, ACE_TRY_ENV); - break; - default: - retval = CORBA::TypeCode::TRAVERSE_STOP; - } // end of switch - - return retval; -} - -// deep free for primitives -CORBA::TypeCode::traverse_status -TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr tc, - const void *, - const void *, - CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::TCKind my_kind; - - if (!tc) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Primitive::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); - } - - my_kind = tc->kind (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - switch (my_kind) - { - case CORBA::tk_null: - case CORBA::tk_void: - case CORBA::tk_char: - case CORBA::tk_octet: - case CORBA::tk_short: - case CORBA::tk_ushort: - case CORBA::tk_wchar: - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_double: - case CORBA::tk_longdouble: - case CORBA::tk_boolean: - break; - default: - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Primitive::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free structs -CORBA::TypeCode::traverse_status -TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, - const void *source, - const void *dest, - CORBA::Environment &ACE_TRY_ENV) -{ - if (!tc) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); - } - - // In case this hasn't been done yet. - source = ACE_ptr_align_binary (source, - tc->alignment (ACE_TRY_ENV)); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - CORBA::TypeCode_var param; - CORBA::Long size, alignment, align_offset; - - void *start_addr = (void *)source; - - // Number of fields in the struct. - // compute the number of fields in the struct - int member_count = tc->member_count (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - for (int i = 0; i < member_count && retval == - CORBA::TypeCode::TRAVERSE_CONTINUE; i++) - { - // get the typecode for the ith field - param = tc->member_type (i, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - // get the size of the field - size = param->size (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - alignment = param->alignment (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - align_offset = - (ptr_arith_t) ACE_ptr_align_binary (source, alignment) - - (ptr_arith_t) source - - ((ptr_arith_t) ACE_ptr_align_binary (start_addr, alignment) - - (ptr_arith_t) start_addr); - if (align_offset < 0) - align_offset += alignment; - - // if both the start_addr and data are not aligned as per - // the alignment, we do not add the offset - source = (const void *) ((ptr_arith_t) source + - ((align_offset == alignment) ? - 0 : align_offset)); - - // Since every exception-throwing function is followed by a break, we'll just - // check for exception after the switch. - switch (param->kind_) - { - case CORBA::tk_null: - case CORBA::tk_void: - case CORBA::tk_short: - case CORBA::tk_ushort: - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_boolean: - case CORBA::tk_char: - case CORBA::tk_octet: - case CORBA::tk_longdouble: - case CORBA::tk_wchar: - break; - case CORBA::tk_any: - retval = TAO_Marshal_Any::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_TypeCode: - retval = TAO_Marshal_TypeCode::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_Principal: - retval = TAO_Marshal_Principal::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - - case CORBA::tk_objref: - { - typedef TAO_Object_Field_T<CORBA::Object,CORBA::Object_var> - TAO_Object_Field_Class; - TAO_Object_Field_Class* field = - ACE_reinterpret_cast (TAO_Object_Field_Class *, - ACE_const_cast (void *, source)); - field->_release (); - retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - } - break; - - case CORBA::tk_struct: - retval = TAO_Marshal_Struct::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_union: - retval = TAO_Marshal_Union::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_string: - retval = TAO_Marshal_String::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_sequence: - retval = TAO_Marshal_Sequence::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_array: - retval = TAO_Marshal_Array::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_alias: - retval = TAO_Marshal_Alias::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_except: - retval = TAO_Marshal_Except::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_wstring: - retval = TAO_Marshal_WString::deep_free (param.in (), source, dest, ACE_TRY_ENV); - break; - default: - retval = CORBA::TypeCode::TRAVERSE_STOP; - } // end of switch - source = (char *)source + size; - } // end of loop - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for union -CORBA::TypeCode::traverse_status -TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, - const void *data, - const void *data2, - CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - CORBA::TypeCode_var discrim_tc; - CORBA::TypeCode_var member_tc; - CORBA::Any_ptr member_label; - const void *discrim_val; - CORBA::ULong member_count; - CORBA::Long default_index; - CORBA::ULong i; - CORBA::TypeCode_ptr default_tc = 0; - CORBA::Boolean discrim_matched = 0; - TAO_Base_Union *base_union; - void *member_val; - - // Get a base pointer so we can use the union's virtual functions. - base_union = ACE_reinterpret_cast (TAO_Base_Union *, - ACE_const_cast (void *, - data)); - - discrim_tc = tc->discriminator_type (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - discrim_val = base_union->_discriminant (); - // Get a pointer to the discriminator value. - - member_val = base_union->_access (0); - // Get a pointer to the member, but don't allocate new storage. - - default_index = tc->default_index (ACE_TRY_ENV); - // now get ready to marshal the actual union value - ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP); - - member_count = tc->member_count (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - // check which label value matches with the discriminator - // value. Accordingly, marshal the corresponding - // member_type. If none match, check if default exists - // and marshal accordingly. Otherwise it is an error. - for (i = 0; member_count-- != 0; i++) - { - member_label = tc->member_label (i, ACE_TRY_ENV); - ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP); - - // do the matching - CORBA::TypeCode_var type = member_label->type (); - switch (type->kind (ACE_TRY_ENV)) - { - // @@ This is not going to work, it assumes that the CDR - // stream is in the same byte order. - case CORBA::tk_short: - if (*(CORBA::Short *)member_label->_tao_get_cdr ()->base () == - *(CORBA::Short *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_ushort: - if (*(CORBA::UShort *)member_label->_tao_get_cdr ()->base () == - *(CORBA::UShort *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_long: - if (*(CORBA::Long *)member_label->_tao_get_cdr ()->base () == - *(CORBA::Long *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_ulong: - case CORBA::tk_enum: - if (*(CORBA::ULong *)member_label->_tao_get_cdr ()->base () == - *(CORBA::ULong *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_char: - if (*(CORBA::Char *)member_label->_tao_get_cdr ()->base () == - *(CORBA::Char *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_wchar: - if (*(CORBA::WChar *)member_label->_tao_get_cdr ()->base () == - *(CORBA::WChar *)discrim_val) - discrim_matched = 1; - break; - case CORBA::tk_boolean: - if (*(CORBA::Boolean *)member_label->_tao_get_cdr ()->base () == - *(CORBA::Boolean *)discrim_val) - discrim_matched = 1; - break; - default: - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), - CORBA::TypeCode::TRAVERSE_STOP); - }// end of switch - - // get the member typecode - member_tc = tc->member_type (i, ACE_TRY_ENV); - ACE_CHECK_RETURN ( CORBA::TypeCode::TRAVERSE_STOP); - - if (default_index >= 0 && default_index-- == 0) - { - // have we reached the default label?, if so, - // save a handle to the typecode for the default - default_tc = member_tc.in (); - } - if (discrim_matched) - { - // deep_free the discriminator value - retval = DEEP_FREE (discrim_tc.in (), - discrim_val, - data2, - ACE_TRY_ENV); - - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - - // marshal according to the matched typecode - return DEEP_FREE (member_tc.in (), - member_val, - data2, - ACE_TRY_ENV); - } // end of if - } // end of for - - // we are here only if there was no match - - // deep_free the discriminator value - retval = DEEP_FREE (discrim_tc.in (), - discrim_val, - data2, - ACE_TRY_ENV); - - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - - if (default_tc) - return DEEP_FREE (default_tc, - member_val, - data2, - ACE_TRY_ENV); - else - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free for Sequence -CORBA::TypeCode::traverse_status -TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr tc, - const void *source, - const void *, - CORBA::Environment &) -{ - // TAO implements sequences using inheritance from a base - // class. That class allocate and deallocates the buffer, using - // virtual methods. - - if (tc) - { - TAO_Base_Sequence *src = - ACE_reinterpret_cast(TAO_Base_Sequence*,ACE_const_cast(void*,source)); - - src->_deallocate_buffer (); - return CORBA::TypeCode::TRAVERSE_CONTINUE; - } - return CORBA::TypeCode::TRAVERSE_STOP; -} - -// deep_free for Array -CORBA::TypeCode::traverse_status -TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, - const void *source, - const void *dest, - CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::TypeCode::traverse_status retval = - CORBA::TypeCode::TRAVERSE_CONTINUE; // return status - CORBA::TypeCode_var tc2; // typecode of the element - size_t size; // size of element - CORBA::ULong bounds; - - // Rely on binary format of sequences -- all are the same - // except for the type pointed to by "buffer" - - if (!tc) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - - bounds = tc->length (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // exception getting bounds - - // get element typecode - tc2 = tc->content_type (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // exception computing content type - - // get the size of the element type - size = tc2->size (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - switch (tc2->kind_) - { - case CORBA::tk_null: - case CORBA::tk_void: - case CORBA::tk_short: - case CORBA::tk_ushort: - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_boolean: - case CORBA::tk_char: - case CORBA::tk_octet: - case CORBA::tk_longdouble: - case CORBA::tk_wchar: - case CORBA::tk_enum: - // CORBA::release (tc2); - return CORBA::TypeCode::TRAVERSE_CONTINUE; - - // handle all aggregate types here - case CORBA::tk_any: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Any::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_TypeCode: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_TypeCode::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_Principal: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Principal::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_objref: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_ObjRef::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_struct: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Struct::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_union: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Union::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_string: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_String::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_sequence: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Sequence::deep_free (tc2.in(), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_array: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Array::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_alias: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Alias::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_except: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_Except::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - case CORBA::tk_wstring: - while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) - { - retval = TAO_Marshal_WString::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - source = (char *)source + size; - } - break; - default: - retval = CORBA::TypeCode::TRAVERSE_STOP; - break; - } // end of switch - // CORBA::release (tc2); - if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Sequence::deep_free detected error\n"))); - // error exit - ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); - } - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free alias -CORBA::TypeCode::traverse_status -TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, - const void *source, - const void *dest, - CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::TypeCode_var tc2; // typecode of the aliased type - CORBA::TypeCode::traverse_status retval = - CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation - - if (!tc) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Alias::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - - // get element type - tc2 = tc->content_type (ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // exception getting content_type - - // switch on the data type and handle the cases for primitives here for - // efficiency - switch (tc2->kind_) - { - case CORBA::tk_null: - case CORBA::tk_void: - case CORBA::tk_short: - case CORBA::tk_ushort: - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - case CORBA::tk_enum: - case CORBA::tk_double: - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_boolean: - case CORBA::tk_char: - case CORBA::tk_octet: - case CORBA::tk_longdouble: - case CORBA::tk_wchar: - // CORBA::release (tc2); - return CORBA::TypeCode::TRAVERSE_CONTINUE; - case CORBA::tk_any: - retval = TAO_Marshal_Any::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_TypeCode: - retval = TAO_Marshal_TypeCode::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_Principal: - retval = TAO_Marshal_Principal::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_objref: - retval = TAO_Marshal_ObjRef::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_struct: - retval = TAO_Marshal_Struct::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_union: - retval = TAO_Marshal_Union::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_string: - retval = TAO_Marshal_String::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_sequence: - retval = TAO_Marshal_Sequence::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_array: - retval = TAO_Marshal_Array::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_alias: - retval = TAO_Marshal_Alias::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_except: - retval = TAO_Marshal_Except::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - case CORBA::tk_wstring: - retval = TAO_Marshal_WString::deep_free (tc2.in (), source, dest, ACE_TRY_ENV); - break; - default: - // anything else is an error - retval = CORBA::TypeCode::TRAVERSE_STOP; - } - // CORBA::release (tc2); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - { - // We should never reach here. - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Alias::decode detected error\n"))); - ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} - -// deep_free structs -CORBA::TypeCode::traverse_status -TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr tc, - const void *, - const void *, - CORBA::Environment &ACE_TRY_ENV) -{ -#if 0 - // temporarily commented out to make compiler happy - CORBA::Long i, - member_count; // number of fields in the struct - CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - CORBA::TypeCode_ptr param; - CORBA::Long size, alignment; -#endif /* 0 */ - - if (!tc) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("TAO_Marshal_Except::deep_free detected error\n"))); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), - CORBA::TypeCode::TRAVERSE_STOP); - } - // XXX: Exceptions are currently leaked because of bugs lurking - // in this area. Keep in mind that there are two things to - // free: (a) the typecode in the exception base class; (b) any - // pointers held by a user-defined exception, such as an objref - // or string. - // - // Since this code does nothing, it should leak BOTH of those - // kinds of memory. Since it's not supposed to be called except - // when the exception really is being freed, it should only be - // called when the reference count in the exception base class - // is zero. - // - // It's not clear which of those assertions actually hold. - // - // The code SHOULD be just like the traverse () call for a - // structure, with (a) a precondition that the reference count - // is zero, (b) an assertion that the typecode in the exception - // and "tc" are equivalent, (c) releasing that typecode found - // within the exception. - // - return CORBA::TypeCode::TRAVERSE_CONTINUE; -} |