diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-26 09:52:55 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-26 09:52:55 +0000 |
| commit | e147674fbe91916fa8fd2189a9d62c091bebd27c (patch) | |
| tree | 09e01f05117ff081bebb8e250aaf3781d2100612 | |
| parent | ad4a870f8f0b8aa2194a157001ed88cbf5dd45fb (diff) | |
| download | ATCD-e147674fbe91916fa8fd2189a9d62c091bebd27c.tar.gz | |
ChangeLogTag: Fri Aug 26 09:49:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
76 files changed, 206 insertions, 1612 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a2646b2fb75..5faaf226120 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,89 @@ +Fri Aug 26 09:49:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp + * TAO_IDL/be/be_visitor_exception/exception_ch.cpp + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp + * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp + * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp + * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp + * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp + * TAO_IDL/include/utl_err.h + * TAO_IDL/util/utl_err.cpp + * docs/compiler.html + When the -St option is used to suppress typecodes, we now + also suppress the type codes of user exceptions. There is no + requirement for this from the orb, the only functionality the + user looses is the ability to retrieve which exceptions an + operation throws using interceptors. + + * tao/Adapter_Factory.cpp + * tao/BiDir_Adapter.cpp + * tao/CORBALOC_Parser.cpp + * tao/Cleanup_Func_Registry.cpp + * tao/DLL_Parser.cpp + * tao/Endpoint_Selector_Factory.cpp + * tao/Environment.cpp + * tao/Exclusive_TMS.cpp + * tao/FILE_Parser.cpp + * tao/IFR_Client_Adapter.cpp + * tao/IOR_Parser.cpp + * tao/LF_Follower.cpp + * tao/Leader_Follower.cpp + * tao/MCAST_Parser.cpp + * tao/Muxed_TMS.cpp + * tao/ORB.cpp + * tao/ORB_Core.cpp + * tao/ORB_Table.cpp + * tao/Resource_Factory.cpp + * tao/Stub.cpp + * tao/Stub_Factory.cpp + * tao/TSS_Resources.cpp + * tao/Transport_Cache_Manager.cpp + * tao/default_resource.cpp + * tao/Codeset/Codeset_Manager_i.cpp + * tao/Codeset/UTF16_BOM_Factory.cpp + * tao/Codeset/UTF8_Latin1_Factory.cpp + * tao/DynamicAny/DynAnyFactory.cpp + * tao/DynamicAny/DynUnion_i.cpp + * tao/DynamicInterface/ExceptionList.cpp + * tao/DynamicInterface/Request.cpp + * tao/IORManipulation/IORManipulation.cpp + * tao/Messaging/Asynch_Invocation.cpp + * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp + * tao/PortableServer/Active_Object_Map.cpp + * tao/PortableServer/ImR_Client_Adapter.cpp + * tao/PortableServer/LifespanStrategyPersistent.cpp + * tao/PortableServer/LifespanStrategyTransient.cpp + * tao/PortableServer/Object_Adapter.cpp + * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp + * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp + * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp + * tao/PortableServer/Root_POA.cpp + * tao/PortableServer/Root_POA.inl + * tao/RTCORBA/RT_Mutex.cpp + * tao/RTCORBA/RT_ORB.cpp + * tao/RTCORBA/RT_Protocols_Hooks.cpp + * tao/RTCORBA/Thread_Pool.cpp + * tao/RTScheduling/Current.cpp + * tao/Strategies/DIOP_Connection_Handler.cpp + * tao/Strategies/DIOP_Connector.cpp + * tao/Strategies/SCIOP_Acceptor.cpp + * tao/Strategies/SCIOP_Connection_Handler.cpp + * tao/Strategies/SCIOP_Connector.cpp + * tao/Strategies/SHMIOP_Acceptor.cpp + * tao/Strategies/SHMIOP_Connection_Handler.cpp + * tao/Strategies/SHMIOP_Connector.cpp + * tao/Strategies/UIOP_Acceptor.cpp + * tao/Strategies/UIOP_Connection_Handler.cpp + * tao/Strategies/UIOP_Connector.cpp + * tao/Strategies/advanced_resource.cpp + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp + * tao/Valuetype/AbstractBase.cpp + * tao/Valuetype/StringValueC.cpp + * tao/Valuetype/ValueFactory_Map.cpp + Fixed emulated exception fuzz errors and removed explicit + template instantiations + Thu Aug 25 17:15:27 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 076109701f7..7a89cbc44de 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1412,8 +1412,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) // that require all necessary non-dependent names be parsed prior to // parsing templates that may use them (e.g. GNU g++ 3.4.x). - this->gen_cond_file_include ((be_global->tc_support () - || idl_global->exception_seen_) + this->gen_cond_file_include (be_global->tc_support () && !be_global->gen_anyop_files (), "tao/AnyTypeCode/AnyTypeCode_methods.h", this->client_header_); @@ -1621,7 +1620,7 @@ TAO_CodeGen::gen_stub_src_includes (void) << "\""; } - if ((be_global->tc_support () || idl_global->exception_seen_) + if (be_global->tc_support () && !be_global->gen_anyop_files ()) { this->gen_typecode_includes (this->client_stubs_); diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 247654bcf40..dea21701546 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -125,36 +125,27 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) } } - *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; - - // No check for typecode suppression here, since the typecode is - // required in generated code for an operation that raises the - // exception. We have already output a warning message when - // launching the stub header typecode visitor. - *os << be_nl << be_nl - << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + if (be_global->tc_support ()) + { + *os << be_nl << be_nl + << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + } *os << be_uidt_nl << "};"; - // If typecode generation is suppressed, we just output a warning - // and generate the typecode anyway, since the typecode is required - // if an operation raises the exception. - if (!be_global->tc_support ()) + if (be_global->tc_support ()) { - idl_global->err ()->tc_suppression_warning (node); - } - - be_visitor_context ctx (*this->ctx_); - be_visitor_typecode_decl visitor (&ctx); + be_visitor_context ctx (*this->ctx_); + be_visitor_typecode_decl visitor (&ctx); - if (node->accept (&visitor) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_exception_ch::" - "visit_exception - " - "TypeCode declaration failed\n"), - -1); + if (node->accept (&visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_exception_ch::" + "visit_exception - " + "TypeCode declaration failed\n"), + -1); + } } os->gen_endif (); 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 ad504834d94..69014b8c6d5 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -332,34 +332,32 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << be_nl << be_nl; } - // No check for typecode suppression here, since the typecode is - // required in generated code for an operation that raises the - // exception. We have already output a warning message when - // launching the stub header typecode visitor. - *os << "// TAO extension - the virtual _type method." << be_nl; - *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; - *os << "{" << be_idt_nl; - *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; - *os << "}"; + if (be_global->tc_support ()) + { + *os << "// TAO extension - the virtual _type method." << be_nl; + *os << "::CORBA::TypeCode_ptr " << node->name () + << "::_tao_type (void) const" << be_nl; + *os << "{" << be_idt_nl; + *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; + *os << "}"; + } // Make sure we are generating to *C.cpp regardless of the above. os = tao_cg->client_stubs (); - // No check for typecode suppression here, since the typecode is - // required in generated code for an operation that raises the - // exception. We have already output a warning message when - // launching the stub header typecode visitor. - ctx = *this->ctx_; - TAO::be_visitor_struct_typecode tc_visitor (&ctx); - - if (tc_visitor.visit_exception (node) == -1) + if (be_global->tc_support ()) { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_visitor_exception_cs::" - "visit_exception - " - "TypeCode definition failed\n"), - -1); + ctx = *this->ctx_; + TAO::be_visitor_struct_typecode tc_visitor (&ctx); + + if (tc_visitor.visit_exception (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_exception_cs::" + "visit_exception - " + "TypeCode definition failed\n"), + -1); + } } node->cli_stub_gen (I_TRUE); diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index 05e5c7eaf38..28303432bdf 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_exception, - exception_ctor, +ACE_RCSID (be_visitor_exception, + exception_ctor, "$Id$") @@ -40,7 +40,7 @@ int be_visitor_exception_ctor::post_process (be_decl *bd) { // This checks for members of an enum 'non-scope' declared inside - // the exception. If an enum val is actually a member, it will + // the exception. If an enum val is actually a member, it will // have node type NT_field. if (bd->node_type () == AST_Decl::NT_enum_val) { @@ -303,7 +303,7 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node) *os << "const ::" << bt->name () << "_ptr "; } } - else + else { if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp index 30498f179d3..6a9cf40648b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp @@ -164,9 +164,18 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation ( << "\"" << ex->repoID () << "\"," << be_nl; // Allocator method. *os << ex->name () << "::_alloc" - << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl - << ", " << ex->tc_name () - << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl + << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl; + + if (be_global->tc_support ()) + { + *os << ", " << ex->tc_name (); + } + else + { + *os << ", 0"; + } + + *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl << "}"; ++excep_count; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp index ee498ff4222..e5526734133 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp @@ -65,10 +65,18 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node) *os << "{" << be_idt_nl << "\"" << ex->repoID () << "\"," << be_nl << ex->name () << "::_alloc" - << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl - << ", " << ex->tc_name () - << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl + << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl; + if (be_global->tc_support ()) + { + *os << ", " << ex->tc_name (); + } + else + { + *os << ", 0"; + } + + *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl << "}"; ei.next (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp index 011ff659404..d8d4d18784d 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp @@ -44,8 +44,9 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node) *os << be_nl << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl; - // Don't do anything if the exception list is empty. - if (node->exceptions ()) + // When there are exceptions and typecode support is enabled, then generate + // the typecodes of the user exceptions this operation can throw. + if (node->exceptions () && be_global->tc_support ()) { *os << "static ::CORBA::TypeCode_ptr const exceptions[] = " << be_idt_nl; *os << "{" << be_idt_nl; diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index ea9792768a0..fc6c0689fb7 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -324,20 +324,18 @@ public: // Report back-end error void back_end (long lineno, UTL_String *s); - + // Report illegal infix operator error (they can be used // only with integer, floating point or fixed point expressions. void illegal_infix (void); - + // Report local type used in remote operation. void local_remote_mismatch (AST_Decl *l, UTL_Scope *s); - + // Improper use of -Sm option. void ignore_idl3_error (AST_Decl *d); - - // Improper use of -St option. - void tc_suppression_warning (AST_Decl *d); + }; #endif // _UTL_ERR_UTL_ERR_HH diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index 93bc2d29c61..779d3dbdc5b 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -81,8 +81,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (util, - utl_err, +ACE_RCSID (util, + utl_err, "$Id$") // Convert an error code into a const char * @@ -277,7 +277,7 @@ exprtype_to_string (AST_Expression::ExprType t) static const char * parse_state_to_error_message (IDL_GlobalData::ParseState ps) { - switch (ps) + switch (ps) { case IDL_GlobalData::PS_NoState: return "Statement cannot be parsed"; @@ -1043,7 +1043,7 @@ UTL_Error::constant_expected (UTL_ScopedName *n, // Report a situation where an interface was expected but we got // something else instead. This most likely is a case in a supports // or inheritance list. -void +void UTL_Error::interface_expected (AST_Decl *d) { idl_error_header (EIDL_INTERFACE_EXPECTED, @@ -1058,7 +1058,7 @@ UTL_Error::interface_expected (AST_Decl *d) // Report a situation where an value type was expected but we got // something else instead. This most likely is a case in a primary // key, emits, publishes or consumes declaration. -void +void UTL_Error::valuetype_expected (AST_Decl *d) { idl_error_header (EIDL_VALUETYPE_EXPECTED, @@ -1073,7 +1073,7 @@ UTL_Error::valuetype_expected (AST_Decl *d) // Report a situation where a concrete value type was expected but we got // something else instead. This most likely is a case where a valuetype // inherits from something other than a concrete valuetype. -void +void UTL_Error::concrete_valuetype_expected (AST_Decl *d) { idl_error_header (EIDL_CONCRETE_VT_EXPECTED, @@ -1089,7 +1089,7 @@ UTL_Error::concrete_valuetype_expected (AST_Decl *d) // something else instead. This is the case in an inheritance // list where a concrete type appears after an abstract type, or // where a valuetype inherits more than one concrete valuetype. -void +void UTL_Error::abstract_expected (AST_Decl *d) { idl_error_header (EIDL_ABSTRACT_EXPECTED, @@ -1105,7 +1105,7 @@ UTL_Error::abstract_expected (AST_Decl *d) // something else instead. This is the case in an inheritance // list where a concrete type appears after an abstract type, or // where a valuetype inherits more than one concrete valuetype. -void +void UTL_Error::eventtype_expected (AST_Decl *d) { idl_error_header (EIDL_EVENTTYPE_EXPECTED, @@ -1120,7 +1120,7 @@ UTL_Error::eventtype_expected (AST_Decl *d) // Report a situation where a valuetype used as a primary key for a // component home does not inherit directly or indirectly from // Components::primaryKeyBase. -void +void UTL_Error::primary_key_error (AST_Decl *d) { idl_error_header (EIDL_PRIMARY_KEY_ERROR, @@ -1397,15 +1397,3 @@ UTL_Error::ignore_idl3_error (AST_Decl *d) idl_global->set_err_count (idl_global->err_count () + 1); } -void -UTL_Error::tc_suppression_warning (AST_Decl *d) -{ - this->warning1 (EIDL_TC_SUPPRESSION_WARNING, d); - ACE_ERROR ((LM_ERROR, - "-St option ignored for ")); - d->name ()->dump (*ACE_DEFAULT_LOG_STREAM); - ACE_ERROR ((LM_ERROR, - ". Type code required to raise IDL exception.\n")); -} - - diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index 1e15a72a18e..e30da68326f 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -752,9 +752,7 @@ also receives other options that are specific to it.<p> <td>Suppress generation of typecodes</td> <td>Also suppresses the generation of the Any operators, since they need the - associated typecode. IDL operations that may raise a user-defined exception - require the exception's typecode, so this option is ignored for user - exception typecode generation, and a warning message is output.</td> + associated typecode.</td> </tr> <tr><a name="Sc"> diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp index f28a7604336..99c8ea348d9 100644 --- a/TAO/tao/Adapter_Factory.cpp +++ b/TAO/tao/Adapter_Factory.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Adapter_Factory.h" -#include "ace/Dynamic_Service.h" // **************************************************************** @@ -9,12 +8,3 @@ TAO_Adapter_Factory::~TAO_Adapter_Factory (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Adapter_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Adapter_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/BiDir_Adapter.cpp b/TAO/tao/BiDir_Adapter.cpp index 81c93de5724..90b60d1b393 100644 --- a/TAO/tao/BiDir_Adapter.cpp +++ b/TAO/tao/BiDir_Adapter.cpp @@ -1,23 +1,10 @@ // @(#) $Id$ #include "tao/BiDir_Adapter.h" -#include "ace/Dynamic_Service.h" ACE_RCSID(tao, BiDir_Adapter, "$Id$") - TAO_BiDir_Adapter::~TAO_BiDir_Adapter (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_BiDir_Adapter>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_BiDir_Adapter> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 24e864be1df..6cfd877911b 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -141,6 +141,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // Get the Connector Registry from the ORB. TAO_Connector_Registry *conn_reg = orb->orb_core ()->connector_registry(ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); while (1) { // will loop on comma only. size_t len = 0; @@ -352,8 +353,3 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBALOC_Parser, ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser) -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base<TAO_CORBALOC_Parser::parsed_endpoint> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index 50e06b17d94..0c574d13b87 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -56,12 +56,3 @@ TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects) } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Array_Base<ACE_CLEANUP_FUNC>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Array_Base<ACE_CLEANUP_FUNC> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index f01a4ba234b..7854e219b39 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -494,13 +494,3 @@ TAO_Codeset_Manager_i::get_translator_i (TAO_Codeset_Descriptor& cd, return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Codeset_Translator_Factory> - -# endif diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index ea3c0b2a35e..4c5cc92f1fa 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -22,18 +22,6 @@ #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -// Instantiate templates that allow discovery of this factory -// via the Service Manager. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_UTF16_BOM_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_UTF16_BOM_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - ACE_STATIC_SVC_DEFINE (TAO_UTF16_BOM_Factory, ACE_TEXT ("UTF16_BOM_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 05b3184ae99..6b9d2881330 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -3,18 +3,6 @@ #include "ace/Dynamic_Service.h" #include "UTF8_Latin1_Factory.h" -// Instantiate templates that allow discovery of this factory -// in the Service Manager. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_UTF8_Latin1_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_UTF8_Latin1_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_TEXT ("UTF8_Latin1_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index 1c9bbd07eca..b8c4608aefc 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -74,8 +74,3 @@ ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser, ACE_FACTORY_DEFINE (TAO, TAO_DLL_Parser) -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 032cdb79fb3..63e18a2bc87 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -377,26 +377,3 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc return DynamicAny::DynAny::_nil (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Array_Base<DynamicAny::DynAny_var>; - -template class ACE_Auto_Basic_Ptr<TAO_DynAny_i>; -template class ACE_Auto_Basic_Ptr<TAO_DynArray_i>; -template class ACE_Auto_Basic_Ptr<TAO_DynEnum_i>; -template class ACE_Auto_Basic_Ptr<TAO_DynSequence_i>; -template class ACE_Auto_Basic_Ptr<TAO_DynStruct_i>; -template class ACE_Auto_Basic_Ptr<TAO_DynUnion_i>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Array_Base<DynamicAny::DynAny_var> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynAny_i> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynArray_i> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynEnum_i> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynSequence_i> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynStruct_i> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_DynUnion_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 59d6bfe352a..0ef86d1b3c5 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -266,6 +266,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any, if (default_index == -1) { set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } else { diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 38b90ffec8f..e28cc9431b0 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -104,16 +104,4 @@ CORBA::ExceptionList::_decr_refcnt (void) } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>; -template class ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong>; -template class ACE_Node<CORBA::TypeCode_ptr>; -template class ACE_Unbounded_Queue<CORBA::TypeCode_ptr>; -template class ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> -#pragma instantiate ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong> -#pragma instantiate ACE_Node<CORBA::TypeCode_ptr> -#pragma instantiate ACE_Unbounded_Queue<CORBA::TypeCode_ptr> -#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index f51f0d9f126..bc6317b1e53 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -353,71 +353,3 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, } } - -#if (TAO_HAS_MINIMUM_CORBA == 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class TAO_Pseudo_Var_T<CORBA::Request>; - template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>; - template class - TAO_Unbounded_Pseudo_Sequence< - CORBA::Request - >; - template class - TAO_MngSeq_Var_T< - CORBA::ORB::RequestSeq, - TAO_Pseudo_Object_Manager< - CORBA::Request - > - >; - template class - TAO_Seq_Var_Base_T< - CORBA::ORB::RequestSeq, - TAO_Pseudo_Object_Manager< - CORBA::Request - > - >; - template class - TAO_MngSeq_Out_T< - CORBA::ORB::RequestSeq, - CORBA::ORB::RequestSeq_var, - TAO_Pseudo_Object_Manager< - CORBA::Request - > - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Pseudo_Var_T<CORBA::Request> -# pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var> -# pragma instantiate \ - TAO_Unbounded_Pseudo_Sequence< \ - CORBA::Request \ - > -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - CORBA::ORB::RequestSeq, \ - TAO_Pseudo_Object_Manager< \ - CORBA::Request \ - > \ - > -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - CORBA::ORB::RequestSeq, \ - TAO_Pseudo_Object_Manager< \ - CORBA::Request \ - > \ - > -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::ORB::RequestSeq, \ - CORBA::ORB::RequestSeq_var, \ - TAO_Pseudo_Object_Manager< \ - CORBA::Request \ - > \ - > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/Endpoint_Selector_Factory.cpp b/TAO/tao/Endpoint_Selector_Factory.cpp index eac24e2509a..9e97eb8b282 100644 --- a/TAO/tao/Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Endpoint_Selector_Factory.cpp @@ -1,22 +1,12 @@ // $Id$ #include "tao/Endpoint_Selector_Factory.h" -#include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - Endpoint_Selector_Factory, +ACE_RCSID (tao, + Endpoint_Selector_Factory, "$Id$") TAO_Endpoint_Selector_Factory::~TAO_Endpoint_Selector_Factory (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index c69aa599a9a..77ad725837f 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -207,14 +207,3 @@ CORBA::Environment::print_exception (const char *info, ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class TAO_Pseudo_Var_T<CORBA::Environment>; - template class TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Pseudo_Var_T<CORBA::Environment> -# pragma instantiate TAO_Pseudo_Out_T<CORBA::Environment, CORBA::Environment_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index f2d7edfe627..46453d885d4 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -5,8 +5,8 @@ #include "tao/debug.h" #include "Transport.h" -ACE_RCSID (tao, - Exclusive_TMS, +ACE_RCSID (tao, + Exclusive_TMS, "$Id$") TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport) @@ -126,8 +126,3 @@ TAO_Exclusive_TMS::connection_closed (void) this->rd_->connection_closed (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index d0ba65b8959..85110b780c4 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -89,8 +89,3 @@ ACE_STATIC_SVC_DEFINE (TAO_FILE_Parser, ACE_FACTORY_DEFINE (TAO, TAO_FILE_Parser) -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp index 5465433b0e0..5155f7b0b56 100644 --- a/TAO/tao/IFR_Client_Adapter.cpp +++ b/TAO/tao/IFR_Client_Adapter.cpp @@ -1,20 +1,8 @@ // @(#) $Id$ #include "tao/IFR_Client_Adapter.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, IFR_Client_Adapter, "$Id$") -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_IFR_Client_Adapter>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_IFR_Client_Adapter> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 7a9e1cf18f3..3bba59dba08 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -366,14 +366,3 @@ TAO_IOR_Manipulation_impl::get_profile_count ( return count; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr<TAO_MProfile>; -template class ACE_Auto_Basic_Ptr<TAO_MProfile>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr<TAO_MProfile> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_MProfile> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IOR_Parser.cpp b/TAO/tao/IOR_Parser.cpp index 6c9a01c5336..8852c907d52 100644 --- a/TAO/tao/IOR_Parser.cpp +++ b/TAO/tao/IOR_Parser.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/IOR_Parser.h" -#include "ace/Dynamic_Service.h" ACE_RCSID(tao, IOR_Parser, "$Id$") @@ -9,12 +8,3 @@ TAO_IOR_Parser::~TAO_IOR_Parser (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_IOR_Parser>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_IOR_Parser> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/LF_Follower.cpp b/TAO/tao/LF_Follower.cpp index ad9e3891d58..ccf7ca522f1 100644 --- a/TAO/tao/LF_Follower.cpp +++ b/TAO/tao/LF_Follower.cpp @@ -8,8 +8,8 @@ # include "tao/LF_Follower.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - LF_Follower, +ACE_RCSID (tao, + LF_Follower, "$Id$") TAO_LF_Follower::TAO_LF_Follower (TAO_Leader_Follower &leader_follower) @@ -37,12 +37,3 @@ TAO_LF_Follower::signal (void) return this->condition_.signal (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Intrusive_List_Node<TAO_LF_Follower>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Intrusive_List_Node<TAO_LF_Follower> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp index da7cb06fd74..cd387e73f15 100644 --- a/TAO/tao/Leader_Follower.cpp +++ b/TAO/tao/Leader_Follower.cpp @@ -485,12 +485,3 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event, return result; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Intrusive_List<TAO_LF_Follower>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Intrusive_List<TAO_LF_Follower> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 1861059ef62..2a6fcd9c207 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -454,8 +454,3 @@ ACE_STATIC_SVC_DEFINE (TAO_MCAST_Parser, ACE_FACTORY_DEFINE (TAO, TAO_MCAST_Parser) -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 12693f985fd..6d4c131292a 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -184,12 +184,3 @@ namespace TAO } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# if TAO_HAS_INTERCEPTORS == 1 - template class TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor>; -# endif -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# if TAO_HAS_INTERCEPTORS == 1 -# pragma instantiate TAO::Utils::Auto_Functor <TAO_Asynch_Reply_Dispatcher_Base, TAO::ARDB_Refcount_Functor> -# endif -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 229c9991076..5e8e70d012a 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "tao/Muxed_TMS.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" @@ -228,51 +227,3 @@ TAO_Muxed_TMS::clear_cache (void) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager_Ex <CORBA::ULong, - TAO_Reply_Dispatcher *, - ACE_Hash <CORBA::ULong>, - ACE_Equal_To <CORBA::ULong>, - ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<CORBA::ULong, - TAO_Reply_Dispatcher *>; - -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, - TAO_Reply_Dispatcher *, - ACE_Hash<unsigned int>, - ACE_Equal_To<unsigned int>, - ACE_Null_Mutex>; - -template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong, - TAO_Reply_Dispatcher*, - ACE_Hash<CORBA::ULong>, - ACE_Equal_To<CORBA::ULong>, - ACE_Null_Mutex>; - -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, - TAO_Reply_Dispatcher*, - ACE_Hash<CORBA::ULong>, - ACE_Equal_To<CORBA::ULong>, - ACE_Null_Mutex>; - -template class ACE_Unbounded_Stack<TAO_Reply_Dispatcher*>; -template class ACE_Node<TAO_Reply_Dispatcher*>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager_Ex <CORBA::ULong, TAO_Reply_Dispatcher *, ACE_Hash <CORBA::ULong>, ACE_Equal_To <CORBA::ULong>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, TAO_Reply_Dispatcher *> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_Reply_Dispatcher *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, TAO_Reply_Dispatcher*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> - - -#pragma instantiate ACE_Unbounded_Stack<TAO_Reply_Dispatcher*> - -#pragma instantiate ACE_Node<TAO_Reply_Dispatcher*> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 1c135c9b817..3f0e4187af0 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -2056,14 +2056,3 @@ CORBA::ORB::lookup_value_factory (const char *repository_id return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Pseudo_Var_T<CORBA::ORB>; -template class TAO_Pseudo_Out_T<CORBA::ORB, CORBA::ORB_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Pseudo_Var_T<CORBA::ORB> -#pragma instantiate TAO_Pseudo_Out_T<CORBA::ORB, CORBA::ORB_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ba8a3b4f6b6..605af8ea1a2 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -3127,42 +3127,3 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object return TAO::TAO_CS_REMOTE_STRATEGY; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Lock_Adapter<ACE_Null_Mutex>; -#if defined (ACE_HAS_THREADS) -template class ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Lock_Adapter<TAO_SYNCH_MUTEX>; -#endif /* ACE_HAS_THREADS */ - -template class ACE_Reverse_Lock<TAO_SYNCH_MUTEX>; -template class ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> >; - -template class ACE_TSS<TAO_ORB_Core_TSS_Resources>; - -template class ACE_Array_Base<void *>; - -template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>; -template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex> -#if defined (ACE_HAS_THREADS) -#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_MUTEX> -#endif /* ACE_HAS_THREADS */ - -#pragma instantiate ACE_Reverse_Lock<TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Guard<ACE_Reverse_Lock<TAO_SYNCH_MUTEX> > - -#pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources> - -#pragma instantiate ACE_Array_Base<void *> - -#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory> -#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index 80ce3562e0f..134f5c699df 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -178,16 +178,8 @@ TAO::ORB_Table::instance (void) } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO::ORB_Table,TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 081f4aebb7d..90c4733f5c2 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -230,6 +230,7 @@ namespace TAO ACE_ENV_SINGLE_ARG_DECL) { this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } PortableInterceptor::ReplyStatus diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 673049665c5..17361e7c94f 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -933,220 +933,3 @@ TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id, return 0; } -//////////////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr<TAO_Id_Uniqueness_Strategy>; -template class auto_ptr<TAO_Lifespan_Strategy>; -template class auto_ptr<TAO_Id_Assignment_Strategy>; -template class auto_ptr<TAO_Id_Hint_Strategy>; -template class auto_ptr<TAO_Active_Object_Map::servant_map>; -template class auto_ptr<TAO_Active_Object_Map::user_id_map>; - -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>; -template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>; -template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>; -template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>; -template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>; -template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>; -# endif /* ACE_LACKS_AUTO_PTR */ - -// Common typedefs. -typedef PortableServer::ObjectId id; -typedef PortableServer::Servant servant; -typedef TAO_Active_Object_Map_Entry *value; - -typedef ACE_Pair<id, value> id_expanded_value; -typedef ACE_Reference_Pair<const id, value> id_value_type; -typedef ACE_Reference_Pair<const servant, value> servant_value_type; -typedef ACE_Equal_To<id> id_compare_keys; -typedef ACE_Equal_To<servant> servant_compare_keys; -typedef TAO_ObjectId_Hash id_hash; -typedef TAO_Servant_Hash servant_hash; -typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator; - -template class ACE_Noop_Key_Generator<servant>; - -// Common -template class ACE_Reference_Pair<const id, value>; -template class ACE_Reference_Pair<const servant, value>; - -// Map and iterator classes. -template class ACE_Map<id, value>; -template class ACE_Map<servant, value>; -template class ACE_Iterator<id_value_type>; -template class ACE_Iterator<servant_value_type>; -template class ACE_Reverse_Iterator<id_value_type>; -template class ACE_Reverse_Iterator<servant_value_type>; - -// Iterator base classes. -template class ACE_Iterator_Impl<id_value_type>; -template class ACE_Iterator_Impl<servant_value_type>; -template class ACE_Reverse_Iterator_Impl<id_value_type>; -template class ACE_Reverse_Iterator_Impl<servant_value_type>; - -// Active Map Manager related. -template class ACE_Pair<id, value>; -template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>; -template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>; -template class ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>; -template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>; -template class ACE_Active_Map_Manager<id_expanded_value>; -template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>; - -// Hash Map Manager related. -template class ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>; -template class ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>; -template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>; -template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>; -template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>; -template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>; -template class ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<id, value>; -template class ACE_Hash_Map_Entry<servant, value>; -template class ACE_Equal_To<id>; -template class ACE_Equal_To<servant>; - -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -// Map Manager related. -template class ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>; -template class ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>; -template class ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>; -template class ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>; -template class ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>; -template class ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>; -template class ACE_Map_Manager<id, value, ACE_Null_Mutex>; -template class ACE_Map_Manager<servant, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator<id, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator<servant, value, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>; -template class ACE_Map_Entry<id, value>; -template class ACE_Map_Entry<servant, value>; -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Strategy> -#pragma instantiate auto_ptr<TAO_Lifespan_Strategy> -#pragma instantiate auto_ptr<TAO_Id_Assignment_Strategy> -#pragma instantiate auto_ptr<TAO_Id_Hint_Strategy> -#pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map> -#pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map> - -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map> -# endif /* ACE_LACKS_AUTO_PTR */ - -// Common typedefs. -typedef PortableServer::ObjectId id; -typedef PortableServer::Servant servant; -typedef TAO_Active_Object_Map_Entry * value; - -typedef ACE_Pair<id, value> id_expanded_value; -typedef ACE_Reference_Pair<const id, value> id_value_type; -typedef ACE_Reference_Pair<const servant, value> servant_value_type; -typedef ACE_Equal_To<id> id_compare_keys; -typedef ACE_Equal_To<servant> servant_compare_keys; -typedef TAO_ObjectId_Hash id_hash; -typedef TAO_Servant_Hash servant_hash; -typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator; - -#pragma instantiate ACE_Noop_Key_Generator<servant> - -// Common -#pragma instantiate ACE_Reference_Pair<const id, value> -#pragma instantiate ACE_Reference_Pair<const servant, value> - -// Map and iterator classes. -#pragma instantiate ACE_Map<id, value> -#pragma instantiate ACE_Map<servant, value> -#pragma instantiate ACE_Iterator<id_value_type> -#pragma instantiate ACE_Iterator<servant_value_type> -#pragma instantiate ACE_Reverse_Iterator<id_value_type> -#pragma instantiate ACE_Reverse_Iterator<servant_value_type> - -// Iterator base classes. -#pragma instantiate ACE_Iterator_Impl<id_value_type> -#pragma instantiate ACE_Iterator_Impl<servant_value_type> -#pragma instantiate ACE_Reverse_Iterator_Impl<id_value_type> -#pragma instantiate ACE_Reverse_Iterator_Impl<servant_value_type> - -// Active Map Manager related. -#pragma instantiate ACE_Pair<id, value> -#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter> -#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter> -#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value> -#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value> -#pragma instantiate ACE_Active_Map_Manager<id_expanded_value> -#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value> - -// Hash Map Manager related. -#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<id, value> -#pragma instantiate ACE_Hash_Map_Entry<servant, value> -#pragma instantiate ACE_Equal_To<id> -#pragma instantiate ACE_Equal_To<servant> - -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -// Map Manager related. -#pragma instantiate ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value> -#pragma instantiate ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value> -#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value> -#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value> -#pragma instantiate ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator> -#pragma instantiate ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator> -#pragma instantiate ACE_Map_Manager<id, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Manager<servant, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<id, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<servant, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<id, value> -#pragma instantiate ACE_Map_Entry<servant, value> -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index bd0afb4930c..379a7696117 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -1,7 +1,6 @@ // @(#) $Id$ #include "ImR_Client_Adapter.h" -#include "ace/Dynamic_Service.h" ACE_RCSID (tao, ImR_Client_Adapter, @@ -15,13 +14,6 @@ namespace TAO ImR_Client_Adapter::~ImR_Client_Adapter (void) { } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Dynamic_Service<ImR_Client_Adapter>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Dynamic_Service<ImR_Client_Adapter> - - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 00c2b3226fe..21fba88fcc9 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -135,6 +135,7 @@ namespace TAO LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL) { this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } ::PortableServer::LifespanPolicyValue diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index 14f457efa37..267707e0f75 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -95,6 +95,7 @@ namespace TAO else { this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } } diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index fcd228b74bf..6ad3cc7ad62 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -1242,168 +1242,3 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher) this->servant_dispatcher_ = dispatcher; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -// Common typedefs. -typedef TAO_Object_Adapter::poa_name key; -typedef TAO_Root_POA *value; - -typedef ACE_Pair<key, value> expanded_value; -typedef ACE_Reference_Pair<const key, value> tao_value_type; -typedef ACE_Equal_To<key> compare_keys; -typedef TAO_ObjectId_Hash hash_key; -typedef ACE_Noop_Key_Generator<key> noop_key_generator; - -template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>; -template class auto_ptr<TAO_Object_Adapter::transient_poa_map>; - -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>; -template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>; -# endif /* ACE_LACKS_AUTO_PTR */ - -template class ACE_Noop_Key_Generator<key>; - -// Common -template class ACE_Reference_Pair<const key, value>; - -// Map and iterator classes. -template class ACE_Map<key, value>; -template class ACE_Iterator<tao_value_type>; -template class ACE_Reverse_Iterator<tao_value_type>; - -// Iterator base classes. -template class ACE_Iterator_Impl<tao_value_type>; -template class ACE_Reverse_Iterator_Impl<tao_value_type>; - -// Active Map Manager related. -template class ACE_Pair<key, value>; -template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>; -template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>; -template class ACE_Active_Map_Manager_Iterator_Adapter<tao_value_type, expanded_value>; -template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, expanded_value>; -template class ACE_Active_Map_Manager<expanded_value>; -template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>; -template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>; - -// Hash Map Manager related. -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>; -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ -template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>; -template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>; -template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys>; -template class ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<key, value>; - -// Already in Active_Object_Map.cpp -// template class ACE_Equal_To<key>; - -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -// Map Manager related. -template class ACE_Map_Manager_Iterator_Adapter<tao_value_type, key, value>; -template class ACE_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, key, value>; -template class ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>; -template class ACE_Map_Manager_Adapter<key, value, noop_key_generator>; -template class ACE_Map_Manager<key, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>; -template class ACE_Map_Iterator<key, value, ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>; -template class ACE_Map_Entry<key, value>; -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ - -template class ACE_Unbounded_Set<TAO_POA_Manager *>; -template class ACE_Node<TAO_POA_Manager *>; -template class ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -// Common typedefs. -typedef TAO_Object_Adapter::poa_name key; -typedef TAO_Root_POA *value; - -typedef ACE_Pair<key, value> expanded_value; -typedef ACE_Reference_Pair<const key, value> tao_value_type; -typedef ACE_Equal_To<key> compare_keys; -typedef TAO_ObjectId_Hash hash_key; -typedef ACE_Noop_Key_Generator<key> noop_key_generator; - -#pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy> -#pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map> - -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map> -# endif /* ACE_LACKS_AUTO_PTR */ - -#pragma instantiate ACE_Noop_Key_Generator<key> - -// Common -#pragma instantiate ACE_Reference_Pair<const key, value> - -// Map and iterator classes. -#pragma instantiate ACE_Map<key, value> -#pragma instantiate ACE_Iterator<tao_value_type> -#pragma instantiate ACE_Reverse_Iterator<tao_value_type> - -// Iterator base classes. -#pragma instantiate ACE_Iterator_Impl<tao_value_type> -#pragma instantiate ACE_Reverse_Iterator_Impl<tao_value_type> - -// Active Map Manager related. -#pragma instantiate ACE_Pair<key, value> -#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter> -#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter> -#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<tao_value_type, expanded_value> -#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, expanded_value> -#pragma instantiate ACE_Active_Map_Manager<expanded_value> -#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value> - -// Hash Map Manager related. -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator> -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ -#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<tao_value_type, key, value, hash_key, compare_keys> -#pragma instantiate ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<key, value> - -// Already in Active_Object_Map.cpp -// #pragma instantiate ACE_Equal_To<key> - -#if (TAO_HAS_MINIMUM_POA_MAPS == 0) -// Map Manager related. -#pragma instantiate ACE_Map_Manager_Iterator_Adapter<tao_value_type, key, value> -#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<tao_value_type, key, value> -#pragma instantiate ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator> -#pragma instantiate ACE_Map_Manager_Adapter<key, value, noop_key_generator> -#pragma instantiate ACE_Map_Manager<key, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<key, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<key, value> -#endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ - -#pragma instantiate ACE_Unbounded_Set<TAO_POA_Manager *> -#pragma instantiate ACE_Node<TAO_POA_Manager *> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA_Manager *> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index dd03dbe1f81..feea6d0d7e9 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -128,37 +128,3 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname, return retval; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Iterator_Base_Ex<const char *, - TAO::Operation_Skeletons, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<const char *, - TAO::Operation_Skeletons, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex>; - -template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, - TAO::Operation_Skeletons, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<const char *, - TAO::Operation_Skeletons, - ACE_Hash<const char *>, - ACE_Equal_To<const char *>, - ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<const char *, - TAO::Operation_Skeletons>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO::Operation_Skeletons, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<const char *, TAO::Operation_Skeletons> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 82634050f25..c1ffab9927d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -36,6 +36,7 @@ namespace TAO } RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } PortableServer::ServantManager_ptr diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index 84dbd2881cd..47beac46acc 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -35,6 +35,7 @@ namespace TAO } RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } PortableServer::ServantManager_ptr diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index bf155ab378d..cf8d0d354bc 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -183,7 +183,10 @@ TAO_Root_POA::set_obj_ref_factory ( PortableInterceptor::ObjectReferenceFactory *current_factory ACE_ENV_ARG_DECL) { - if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER)) + TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; + + if (adapter) { // Activate a different factory this->ort_adapter_->set_obj_ref_factory (current_factory @@ -2888,38 +2891,3 @@ TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>; - -template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>; -template class ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *>; -template class ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Write_Guard<ACE_Lock>; -template class ACE_Read_Guard<ACE_Lock>; -template class ACE_Array_Base <IOP::ProfileId>; -template class ACE_Node<TAO_Root_POA *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *> - -#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Write_Guard<ACE_Lock> -#pragma instantiate ACE_Read_Guard<ACE_Lock> -#pragma instantiate ACE_Array_Base <IOP::ProfileId> -#pragma instantiate ACE_Node<TAO_Root_POA *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index a3abcf9341e..cc6a7fd44f6 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -41,7 +41,10 @@ ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * TAO_Root_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER)) + TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + if (adapter) { return this->ort_adapter_->get_adapter_template(); } diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 93117952560..43dd460981a 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -94,10 +94,4 @@ TAO_Named_RT_Mutex::name (void) const //////////////////////////////////////////////////////////////////////////////// -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 8968d055ae6..6d996e8e171 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -548,26 +548,4 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb) //////////////////////////////////////////////////////////////////////////////// -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#if (TAO_HAS_NAMED_RT_MUTEXES == 1) -template class ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var>; -#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#if (TAO_HAS_NAMED_RT_MUTEXES == 1) -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var> -#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 445527d960a..af5d83c29fb 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -814,16 +814,6 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Protocols_Hooks, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_RT_Protocols_Hooks>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_RT_Protocols_Hooks> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_FACTORY_DEFINE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index efcba7d32ce..0640f34104f 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -940,31 +940,4 @@ TAO_Thread_Pool_Manager::thread_pools (void) return this->thread_pools_; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<RTCORBA::ThreadpoolId, TAO_Thread_Pool *>; -template class ACE_Hash_Map_Iterator_Base_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>; - -template class ACE_Auto_Basic_Ptr<TAO_Thread_Pool>; -template class ACE_Auto_Basic_Array_Ptr<size_t>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<RTCORBA::ThreadpoolId, TAO_Thread_Pool *> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Hash<RTCORBA::ThreadpoolId>, ACE_Equal_To<RTCORBA::ThreadpoolId>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<unsigned int, TAO_Thread_Pool *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex> - -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Pool> -#pragma instantiate ACE_Auto_Basic_Array_Ptr<size_t> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index d8074e83f99..b9f61a67120 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -519,10 +519,13 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, { // Check if DT has been cancelled. if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) - this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); + { + this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + } // Create new task for new DT. - DTTask *dttask; + DTTask *dttask = 0; // If no scheduling parameter is specified then use the current // implicit scheduling parameter as the scheduling parameter @@ -530,7 +533,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, sched_param = this->implicit_sched_param_; RTScheduling::DistributableThread_var dt = TAO_DistributableThread_Factory::create_DT (); - TAO_RTScheduler_Current_i *new_current; + TAO_RTScheduler_Current_i *new_current = 0; ACE_NEW_RETURN (new_current, TAO_RTScheduler_Current_i (this->orb_, @@ -977,22 +980,3 @@ const char* TAO_RTScheduler_Current::_interface_repository_id (void) const return "IDL:TAO_RTScheduler_Current:1.0"; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Equal_To<IdType>; -template class ACE_Hash_Map_Manager_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<IdType, RTScheduling::DistributableThread_var>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Equal_To<IdType>; -#pragma instantiate ACE_Hash_Map_Manager_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Entry<IdType, RTScheduling::DistributableThread_var>; -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<IdType, RTScheduling::DistributableThread_var, TAO_DTId_Hash, ACE_Equal_To<IdType>, TAO_SYNCH_MUTEX>; - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 018db827411..7ab5c57e770 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -4,10 +4,8 @@ #include "Protocol_Factory.h" #include "orbconf.h" -#include "ace/Dynamic_Service.h" #include "ace/ACE.h" - ACE_RCSID (tao, Resource_Factory, "$Id$") @@ -60,15 +58,6 @@ TAO_Resource_Factory::~TAO_Resource_Factory (void) { } -#if 0 -// @@todo: Need to go at a later date! -int -TAO_Resource_Factory::use_tss_resources (void) const -{ - return 0; -} -#endif /*if 0*/ - int TAO_Resource_Factory::use_locked_data_blocks (void) const { @@ -227,20 +216,3 @@ TAO_Resource_Factory::load_default_protocols (void) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Resource_Factory>; -template class ACE_Node<TAO_Protocol_Item*>; -/// -template class ACE_Unbounded_Set<TAO_Protocol_Item*>; -template class ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>; -/// -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory> -#pragma instantiate ACE_Node<TAO_Protocol_Item*> -/// -#pragma instantiate ACE_Unbounded_Set<TAO_Protocol_Item*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index c768a46dc58..cf211c06abe 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -297,18 +297,4 @@ TAO_DIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler> -#pragma instantiate ACE_Creation_Strategy<TAO_DIOP_Connection_Handler> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index fddf82d6106..aa0dfb2eb4a 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -22,25 +22,6 @@ ACE_RCSID (Strategies, DIOP_Connector, "$Id$") -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - -template class ACE_NonBlocking_Connect_Handler<TAO_DIOP_Connection_Handler>; -template class ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *>; -template class ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex >; -template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_DIOP_Connection_Handler> -#pragma instantiate ACE_Map_Entry<ACE_INET_Addr, TAO_DIOP_Connection_Handler *> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex < ACE_INET_Addr,TAO_DIOP_Connection_Handler *, ACE_Hash < ACE_INET_Addr >, ACE_Equal_To < ACE_INET_Addr >, ACE_Null_Mutex > -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_DIOP_Connection_Handler *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_DIOP_PROFILE), lite_flag_ (flag) diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index f7498e0c168..6f0526824c4 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -18,34 +18,6 @@ ACE_RCSID(tao, SCIOP_Acceptor, "$Id$") -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>; -template class ACE_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_SCIOP_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_SCIOP_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> -#pragma instantiate ACE_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> -#pragma instantiate ACE_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate TAO_Accept_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_ACCEPTOR> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE), addrs_ (0), diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index c6b6f60ae5a..5ba76f996fe 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -382,16 +382,4 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_pri return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Svc_Handler<ACE_SOCK_SEQPACK_Association, ACE_NULL_SYNCH>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Svc_Handler<ACE_SOCK_SEQPACK_Association, ACE_NULL_SYNCH> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index b53469bddfa..afff84a56b4 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -24,41 +24,6 @@ ACE_RCSID (TAO, SCIOP_Connector, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler>; -template class TAO_Connect_Creation_Strategy<TAO_SCIOP_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>; -template class ACE_Connector_Base<TAO_SCIOP_Connection_Handler>; -template class ACE_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>; - -template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*>; -template class ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SCIOP_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR> -#pragma instantiate ACE_Connector_Base<TAO_SCIOP_Connection_Handler> -#pragma instantiate ACE_Connector<TAO_SCIOP_Connection_Handler, ACE_SOCK_SEQPACK_CONNECTOR> -#pragma instantiate ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> - -#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO_SCIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SCIOP_PROFILE), lite_flag_ (flag), diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 247284e4299..2e3d09fdb33 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -20,32 +20,6 @@ ACE_RCSID (Strategies, SHMIOP_Acceptor, "$Id$") -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> -#pragma instantiate ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 2874e649437..cbb5c49a9bb 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -249,15 +249,4 @@ TAO_SHMIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -// **************************************************************** -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /*(TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) */ diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 1341956dd65..a4039a0cb85 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -21,30 +21,6 @@ ACE_RCSID (Strategies, SHMIOP_Connector, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; -template class TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_Connector_Base<TAO_SHMIOP_Connection_Handler>; -template class ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_NonBlocking_Connect_Handler<TAO_SHMIOP_Connection_Handler>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR> -#pragma instantiate ACE_Connector_Base<TAO_SHMIOP_Connection_Handler> -#pragma instantiate ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR> -#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_SHMIOP_Connection_Handler> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), connect_strategy_ (), diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 93867880e62..4ec98202ca3 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -19,34 +19,6 @@ ACE_RCSID (Strategies, UIOP_Acceptor, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_UIOP_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_UIOP_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> -#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag) : TAO_Acceptor (TAO_TAG_UIOP_PROFILE), base_acceptor_ (), diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 33e1a07d51a..683ea21ef6d 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -227,14 +227,4 @@ TAO_UIOP_Connection_Handler::add_transport_to_cache (void) this->transport ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /*TAO_HAS_UIOP == 1*/ diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 789f0e3185e..6ce63d9709a 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -21,32 +21,6 @@ ACE_RCSID(Strategies, UIOP_Connector, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>; -template class TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_Connector_Base<TAO_UIOP_Connection_Handler>; -template class ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_NonBlocking_Connect_Handler<TAO_UIOP_Connection_Handler>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Node<ACE_UNIX_Addr> -#pragma instantiate ACE_Unbounded_Stack<ACE_UNIX_Addr> - -#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR> -#pragma instantiate ACE_Connector_Base<TAO_UIOP_Connection_Handler> -#pragma instantiate ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR> -#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_UIOP_Connection_Handler> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_UIOP_PROFILE), connect_strategy_ (), diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 364b6f0d008..8e986ed4f3e 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -883,20 +883,3 @@ ACE_FACTORY_DEFINE (TAO_Strategies, TAO_Advanced_Resource_Factory) // **************************************************************** -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Advanced_Resource_Factory>; - -template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>; -template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; -template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Advanced_Resource_Factory> - -#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token> -#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > -#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 7256093e8c4..d3bc60dce26 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -596,30 +596,3 @@ TAO_Stub::sync_strategy (void) return this->orb_core_->transport_sync_strategy (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#if (TAO_HAS_CORBA_MESSAGING == 1) - -template class auto_ptr<TAO_Policy_Set>; -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_Policy_Set>; -# endif /* ACE_LACKS_AUTO_PTR */ - -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#if (TAO_HAS_CORBA_MESSAGING == 1) - -#pragma instantiate auto_ptr<TAO_Policy_Set> -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Set> -# endif /* ACE_LACKS_AUTO_PTR */ - -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp index 564138e1fab..8540e33e402 100644 --- a/TAO/tao/Stub_Factory.cpp +++ b/TAO/tao/Stub_Factory.cpp @@ -2,8 +2,8 @@ #include "Stub_Factory.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (tao, - TAO_Stub_Factory, +ACE_RCSID (tao, + TAO_Stub_Factory, "$Id$") TAO_Stub_Factory::~TAO_Stub_Factory (void) @@ -11,12 +11,3 @@ TAO_Stub_Factory::~TAO_Stub_Factory (void) // No-Op. } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Stub_Factory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Stub_Factory> - -#endif diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp index 516a081dc82..41b705eb8aa 100644 --- a/TAO/tao/TSS_Resources.cpp +++ b/TAO/tao/TSS_Resources.cpp @@ -4,7 +4,6 @@ #include "GUIResource_Factory.h" #include "TAO_Singleton.h" - ACE_RCSID (tao, TSS_Resources, "$Id$") @@ -41,22 +40,10 @@ TAO_TSS_Resources::instance (void) TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::instance (); } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>; -template class ACE_TSS<TAO_TSS_Resources>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_TSS<TAO_TSS_Resources> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> * TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index 22a34d5ce4f..a401a009585 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -689,38 +689,3 @@ namespace TAO } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - // Instantiations for the Hash Map -template class ACE_Equal_To<Cache_ExtId>; -template class ACE_Hash<Cache_ExtId>; -template class ACE_Hash_Map_Entry<Cache_ExtId, Cache_IntId>; -template class ACE_Hash_Map_Manager_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex>; -template class ACE_Unbounded_Set<TAO_Connection_Handler*>; -template class ACE_Unbounded_Set_Iterator<TAO_Connection_Handler*>; -template class ACE_Node<TAO_Connection_Handler*>; -template class ACE_Unbounded_Stack<TAO_Transport*>; -template class ACE_Node <TAO_Transport *>; - -template class TAO_Condition<ACE_SYNCH_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - // Instantiations for the Hash Map -#pragma instantiate ACE_Equal_To<Cache_ExtId> -#pragma instantiate ACE_Hash<Cache_ExtId> -#pragma instantiate ACE_Hash_Map_Entry<Cache_ExtId, Cache_IntId> -#pragma instantiate ACE_Hash_Map_Manager_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<Cache_ExtId, Cache_IntId, ACE_Hash<Cache_ExtId>, ACE_Equal_To<Cache_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Unbounded_Set<TAO_Connection_Handler*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Connection_Handler*> -#pragma instantiate ACE_Node<TAO_Connection_Handler*> -#pragma instantiate ACE_Unbounded_Stack<TAO_Transport*> -#pragma instantiate ACE_Node <TAO_Transport *> - -#pragma instantiate TAO_Condition<ACE_SYNCH_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 22866614c38..323102b8590 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -317,6 +317,7 @@ TAO_TypeCodeFactory_i::create_union_tc ( CORBA::TCKind const kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (tc); CORBA::ULong ci = 0; // Case array index. @@ -2095,67 +2096,3 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, return tc; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<ACE_CString, int>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, - int, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, - int, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex>; -template class ACE_Equal_To<ACE_CString>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, - int, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex>; -template class ACE_Hash<ACE_CString>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, - int, - ACE_Hash<ACE_CString>, - ACE_Equal_To<ACE_CString>, - ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex>; -template class ACE_Bounded_Set<CORBA::Long>; -template class ACE_Bounded_Set<CORBA::ULong>; -template class ACE_Bounded_Set_Iterator<CORBA::Long>; -template class ACE_Bounded_Set_Iterator<CORBA::ULong>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, int> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, \ - int, \ - ACE_Hash<ACE_CString>, \ - ACE_Equal_To<ACE_CString>, \ - ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, \ - int, \ - ACE_Hash<ACE_CString>, \ - ACE_Equal_To<ACE_CString>, \ - ACE_Null_Mutex> -#pragma instantiate ACE_Equal_To<ACE_CString> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, \ - int, \ - ACE_Hash<ACE_CString>, \ - ACE_Equal_To<ACE_CString>, \ - ACE_Null_Mutex> -#pragma instantiate ACE_Hash<ACE_CString> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, \ - int, \ - ACE_Hash<ACE_CString>, \ - ACE_Equal_To<ACE_CString>, \ - ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> -#pragma instantiate ACE_Bounded_Set<CORBA::Long> -#pragma instantiate ACE_Bounded_Set<CORBA::ULong> -#pragma instantiate ACE_Bounded_Set_Iterator<CORBA::Long> -#pragma instantiate ACE_Bounded_Set_Iterator<CORBA::ULong> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 86388f9095b..87f6cb0b85d 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -425,14 +425,3 @@ CORBA::AbstractBase::equivalent_objref (void) return this->equivalent_obj_.in (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if 0 -template class TAO::Any_Impl_T<CORBA::AbstractBase>; -template class TAO::Any_Impl_T<CORBA::ValueBase>; -#endif -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO::Any_Impl_T<CORBA::AbstractBase> -#pragma instantiate TAO::Any_Impl_T<CORBA::ValueBase> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp index 717160d1506..bb93ab70c34 100644 --- a/TAO/tao/Valuetype/StringValueC.cpp +++ b/TAO/tao/Valuetype/StringValueC.cpp @@ -402,101 +402,3 @@ operator>> ( return CORBA::WStringValue::_tao_unmarshal (strm, _tao_valuebox); } - - -// TAO_IDL - Generated from -// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:1745 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Value_Traits< - CORBA::StringValue - >; - - template class - TAO_Value_Var_T< - CORBA::StringValue - - >; - - template class - TAO_Value_Out_T< - CORBA::StringValue - - >; - - template class - TAO::Any_Impl_T< - CORBA::StringValue - >; - - template class - TAO::Value_Traits< - CORBA::WStringValue - >; - - template class - TAO_Value_Var_T< - CORBA::WStringValue - - >; - - template class - TAO_Value_Out_T< - CORBA::WStringValue - - >; - - template class - TAO::Any_Impl_T< - CORBA::WStringValue - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Value_Traits< \ - CORBA::StringValue \ - > - -# pragma instantiate \ - TAO_Value_Var_T< \ - CORBA::StringValue \ - - > - -# pragma instantiate \ - TAO_Value_Out_T< \ - CORBA::StringValue \ - - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - CORBA::StringValue \ - > - -# pragma instantiate \ - TAO::Value_Traits< \ - CORBA::WStringValue \ - > - -# pragma instantiate \ - TAO_Value_Var_T< \ - CORBA::WStringValue \ - - > - -# pragma instantiate \ - TAO_Value_Out_T< \ - CORBA::WStringValue \ - - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - CORBA::WStringValue \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp index c7c894228af..4cd16ecdef7 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.cpp +++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp @@ -115,25 +115,7 @@ TAO_ValueFactory_Map::instance (void) TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::instance (); } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX>; -template class ACE_Hash_Map_Entry<const char *, CORBA::ValueFactoryBase *>; -template class TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA::ValueFactoryBase *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA::ValueFactoryBase *> -#pragma instantiate TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index de23d785871..cdbb426cac2 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -1080,24 +1080,3 @@ ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, 0) ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr<TAO_Protocol_Factory>; -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -template class ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>; -# endif /* ACE_LACKS_AUTO_PTR */ - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr<TAO_Protocol_Factory> -# if defined (ACE_LACKS_AUTO_PTR) \ - || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \ - && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory> -# endif /* ACE_LACKS_AUTO_PTR */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |