diff options
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Any.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/DomainC.cpp | 98 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/IORA.cpp | 38 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Object_SArg_Traits.h | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POAManagerA.cpp | 18 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/PortableServerA.cpp | 58 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/TypeCode_SArg_Traits.h | 2 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RTCORBAA.cpp | 106 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/ValueBase.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Valuetype/ValueFactory.h | 2 |
17 files changed, 183 insertions, 183 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 61e888f3a27..a0cf3eac176 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -63,7 +63,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) if (node->is_local ()) { *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl << node->name () << "_slice," << be_nl @@ -74,7 +74,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "}"; *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Array_Impl_T<" << be_idt << be_idt_nl << node->name () << "_slice," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 45b966a4a0f..d8d075658d3 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_enum, - any_op_cs, +ACE_RCSID (be_visitor_enum, + any_op_cs, "$Id$") // *************************************************************************** @@ -52,7 +52,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // Since we don't generate CDR stream operators for types that - // explicitly contain a local interface (at some level), we + // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid // calling the non-existent operators. The zero return value // will eventually cause CORBA::MARSHAL to be raised if this @@ -60,7 +60,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) if (node->is_local ()) { *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Basic_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl @@ -69,7 +69,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "}"; *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Basic_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index 5541c9f15bf..085bd892024 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) if (node->is_local ()) { *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl @@ -71,7 +71,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "}"; *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 9e8cd439a26..cd1ab7610e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) if (node->is_local ()) { *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl @@ -71,7 +71,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "}"; *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 042b717f225..d90680fac40 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) if (node->is_local ()) { *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl @@ -71,7 +71,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "}"; *os << be_nl << be_nl - << "ACE_TEMPLATE_SPECIALIZATION" << be_nl + << "template<>" << be_nl << "CORBA::Boolean" << be_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index e881c609647..f8a130f21b9 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -771,7 +771,7 @@ operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc) // ================================================================ // Any_Impl_T template specializations. -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Impl_T<CORBA::Object>::to_object ( CORBA::Object_ptr &_tao_elem diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 03c6c33ef3f..2b43a8a7cd6 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -65,7 +65,7 @@ namespace CORBA #if TAO_HAS_INTERCEPTORS == 1 -ACE_TEMPLATE_SPECIALIZATION +template<> void TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) { @@ -80,7 +80,7 @@ TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic:: #endif /* TAO_HAS_INTERCEPTORS */ -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) { @@ -98,7 +98,7 @@ namespace TAO #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) #define _CORBA_POLICY__ARG_TRAITS_CS_ - + template<> class TAO_Export Arg_Traits<CORBA::Policy> : public @@ -115,7 +115,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ - + template<> class TAO_Export Arg_Traits<CORBA::InterfaceDef> : public @@ -169,7 +169,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -189,21 +189,21 @@ TAO::Collocation_Proxy_Broker * { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_DomainManager_Proxy_Broker_ == 0) { CORBA_DomainManager_setup_collocation (); } - + TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_policy_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -212,10 +212,10 @@ TAO::Collocation_Proxy_Broker * 17, this->the_TAO_DomainManager_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -238,7 +238,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation () CORBA::DomainManager::~DomainManager (void) {} -void +void CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) { DomainManager *_tao_tmp_pointer = @@ -283,7 +283,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -369,7 +369,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -390,23 +390,23 @@ void CORBA::ConstructionPolicy::make_domain_manager ( { ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - + if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0) { CORBA_ConstructionPolicy_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_object_type, &_tao_constr_policy }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -415,7 +415,7 @@ void CORBA::ConstructionPolicy::make_domain_manager ( 19, this->the_TAO_ConstructionPolicy_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -434,14 +434,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation () this->the_TAO_ConstructionPolicy_Proxy_Broker_ = ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Policy_setup_collocation (); } CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} -void +void CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) { ConstructionPolicy *_tao_tmp_pointer = @@ -486,7 +486,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -539,7 +539,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_) @@ -613,21 +613,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::DomainManager RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -649,21 +649,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -679,12 +679,12 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = @@ -692,10 +692,10 @@ CORBA::Boolean operator<< ( _tao_sequence[i].in (), strm ); } - + return _tao_marshal_flag; } - + return false; } @@ -705,7 +705,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -715,28 +715,28 @@ CORBA::Boolean operator>> ( { return false; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return true; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); } - + return _tao_marshal_flag; - + } - + return false; } @@ -798,7 +798,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::DomainManager >; - + template class TAO_Objref_Out_T< CORBA::DomainManager @@ -823,7 +823,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< CORBA::ConstructionPolicy >; - + template class TAO_Objref_Out_T< CORBA::ConstructionPolicy @@ -932,7 +932,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::DomainManager > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::DomainManager @@ -957,7 +957,7 @@ CORBA::Boolean operator>> ( TAO_Objref_Var_T< \ CORBA::ConstructionPolicy > - + # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::ConstructionPolicy @@ -1007,4 +1007,4 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index f20b8630606..198f202c493 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -166,7 +166,7 @@ TAO_DONT_CATCH::TAO_DONT_CATCH (void) // Specializations for CORBA::Exception Any operators. -ACE_TEMPLATE_SPECIALIZATION +template<> void TAO::Any_Dual_Impl_T<CORBA::Exception>::value ( const CORBA::Exception & val @@ -175,7 +175,7 @@ TAO::Any_Dual_Impl_T<CORBA::Exception>::value ( this->value_ = val._tao_duplicate (); } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr) { @@ -195,7 +195,7 @@ TAO::Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr) return 0; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr) { @@ -219,7 +219,7 @@ TAO::Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr) // for CORBA::Exception, but it is here to sidestep the constructor call // in the unspecialized version that causes a problem with compilers that // require explicit instantiation -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<CORBA::Exception>::extract ( const CORBA::Any &, diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index c9c4e8da6ba..9c80b614a85 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -16,7 +16,7 @@ ACE_RCSID (IFR_Client, namespace TAO { - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef> : public Object_Arg_Traits_T< diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp index 8eb464031bd..a5d2c8799ad 100644 --- a/TAO/tao/IORManipulation/IORA.cpp +++ b/TAO/tao/IORManipulation/IORA.cpp @@ -38,7 +38,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_TAO_IOP_EmptyProfileList = 0; static TAO::TypeCode::Struct<char const *, @@ -60,7 +60,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_TAO_IOP_NotFound = 0; static TAO::TypeCode::Struct<char const *, @@ -82,7 +82,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_TAO_IOP_Duplicate = 0; static TAO::TypeCode::Struct<char const *, @@ -104,7 +104,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_TAO_IOP_Invalid_IOR = 0; static TAO::TypeCode::Struct<char const *, @@ -126,7 +126,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:34 static TAO::TypeCode::Struct_Field<char const *> * const _tao_fields_TAO_IOP_MultiProfileList = 0; static TAO::TypeCode::Struct<char const *, @@ -148,7 +148,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:73 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -166,12 +166,12 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:743 +// be\be_visitor_typecode/typecode_defn.cpp:743 namespace TAO { @@ -200,7 +200,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList; // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:73 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -218,7 +218,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -303,7 +303,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -388,7 +388,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -473,7 +473,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -558,7 +558,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -643,7 +643,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -712,7 +712,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -781,18 +781,18 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &) { return false; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &) { diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h index e8f9530e739..f67ee690ea3 100644 --- a/TAO/tao/PortableServer/Object_SArg_Traits.h +++ b/TAO/tao/PortableServer/Object_SArg_Traits.h @@ -42,7 +42,7 @@ namespace TAO /// Used in generated code if CORBA::Object is an argument or /// return type. - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_PortableServer_Export SArg_Traits<CORBA::Object> : public Object_SArg_Traits_T<CORBA::Object_ptr, CORBA::Object_var, diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp index 4d7a0ef785c..09c401a70d0 100644 --- a/TAO/tao/PortableServer/POAManagerA.cpp +++ b/TAO/tao/PortableServer/POAManagerA.cpp @@ -52,7 +52,7 @@ static TAO::TypeCode::Struct<char const *, "AdapterInactive", _tao_fields_PortableServer_POAManager_AdapterInactive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive = &_tao_tc_PortableServer_POAManager_AdapterInactive; @@ -65,7 +65,7 @@ static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableSe { "ACTIVE" }, { "DISCARDING" }, { "INACTIVE" } - + }; static TAO::TypeCode::Enum<char const *, @@ -76,7 +76,7 @@ static TAO::TypeCode::Enum<char const *, "State", _tao_enumerators_PortableServer_POAManager_State, 4); - + ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State = &_tao_tc_PortableServer_POAManager_State; @@ -89,7 +89,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_POAManager ( "IDL:omg.org/PortableServer/POAManager:2.3", "POAManager"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POAManager = @@ -167,7 +167,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -244,14 +244,14 @@ CORBA::Boolean operator>>= ( -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &) { return false; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &) { @@ -277,7 +277,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract ( _tao_any, PortableServer::POAManager::_tc_State, - _tao_elem + _tao_elem ); } @@ -315,4 +315,4 @@ CORBA::Boolean operator>>= ( PortableServer::POAManager \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index c1f60df7a93..b48f8ee79e6 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -55,10 +55,10 @@ namespace TAO CORBA::tk_sequence, &PortableServer::_tc_POA, 0U); - + ::CORBA::TypeCode_ptr const tc_PortableServer_POAList_0 = &PortableServer_POAList_0; - + } } @@ -68,7 +68,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/PortableServer/POAList:1.0", "POAList", &TAO::TypeCode::tc_PortableServer_POAList_0); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POAList = @@ -90,7 +90,7 @@ static TAO::TypeCode::Struct<char const *, "AdapterAlreadyExists", _tao_fields_PortableServer_POA_AdapterAlreadyExists, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists = &_tao_tc_PortableServer_POA_AdapterAlreadyExists; @@ -107,7 +107,7 @@ static TAO::TypeCode::Struct<char const *, "AdapterNonExistent", _tao_fields_PortableServer_POA_AdapterNonExistent, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent = &_tao_tc_PortableServer_POA_AdapterNonExistent; @@ -117,7 +117,7 @@ static TAO::TypeCode::Struct<char const *, static TAO::TypeCode::Struct_Field<char const *> _tao_fields_PortableServer_POA_InvalidPolicy[] = { { "index", &CORBA::_tc_ushort } - + }; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, @@ -128,7 +128,7 @@ static TAO::TypeCode::Struct<char const *, "InvalidPolicy", _tao_fields_PortableServer_POA_InvalidPolicy, 1); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy = &_tao_tc_PortableServer_POA_InvalidPolicy; @@ -145,7 +145,7 @@ static TAO::TypeCode::Struct<char const *, "NoServant", _tao_fields_PortableServer_POA_NoServant, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant = &_tao_tc_PortableServer_POA_NoServant; @@ -162,7 +162,7 @@ static TAO::TypeCode::Struct<char const *, "ObjectAlreadyActive", _tao_fields_PortableServer_POA_ObjectAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive = &_tao_tc_PortableServer_POA_ObjectAlreadyActive; @@ -179,7 +179,7 @@ static TAO::TypeCode::Struct<char const *, "ObjectNotActive", _tao_fields_PortableServer_POA_ObjectNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive = &_tao_tc_PortableServer_POA_ObjectNotActive; @@ -196,7 +196,7 @@ static TAO::TypeCode::Struct<char const *, "ServantAlreadyActive", _tao_fields_PortableServer_POA_ServantAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive = &_tao_tc_PortableServer_POA_ServantAlreadyActive; @@ -213,7 +213,7 @@ static TAO::TypeCode::Struct<char const *, "ServantNotActive", _tao_fields_PortableServer_POA_ServantNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive = &_tao_tc_PortableServer_POA_ServantNotActive; @@ -230,7 +230,7 @@ static TAO::TypeCode::Struct<char const *, "WrongAdapter", _tao_fields_PortableServer_POA_WrongAdapter, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter = &_tao_tc_PortableServer_POA_WrongAdapter; @@ -247,7 +247,7 @@ static TAO::TypeCode::Struct<char const *, "WrongPolicy", _tao_fields_PortableServer_POA_WrongPolicy, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy = &_tao_tc_PortableServer_POA_WrongPolicy; @@ -260,7 +260,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_POA ( "IDL:omg.org/PortableServer/POA:2.3", "POA"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POA = @@ -269,19 +269,19 @@ namespace PortableServer -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_sequence/any_op_cs.cpp:54 -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &) { return false; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &) { @@ -410,7 +410,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -482,7 +482,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -554,7 +554,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -626,7 +626,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -698,7 +698,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -770,7 +770,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -842,7 +842,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -914,7 +914,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -986,7 +986,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -1058,7 +1058,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -1254,4 +1254,4 @@ CORBA::Boolean operator>>= ( PortableServer::POAList \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 5a40a393b43..1960033a44a 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -42,7 +42,7 @@ namespace TAO /// Used in generated code if CORBA::TypeCode is an argument or /// return type. - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_PortableServer_Export SArg_Traits<CORBA::TypeCode> : public Object_SArg_Traits_T<CORBA::TypeCode_ptr, CORBA::TypeCode_var, diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index 57f19bba441..b6c2992c70a 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -50,7 +50,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/NativePriority:1.0", "NativePriority", &CORBA::_tc_short); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_NativePriority = @@ -68,7 +68,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/Priority:1.0", "Priority", &CORBA::_tc_short); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_Priority = @@ -86,7 +86,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/NetworkPriority:1.0", "NetworkPriority", &CORBA::_tc_long); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_NetworkPriority = @@ -104,7 +104,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/ThreadpoolId:1.0", "ThreadpoolId", &CORBA::_tc_ulong); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ThreadpoolId = @@ -121,7 +121,7 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_RTCORBA_ThreadpoolL { "lane_priority", &RTCORBA::_tc_Priority }, { "static_threads", &CORBA::_tc_ulong }, { "dynamic_threads", &CORBA::_tc_ulong } - + }; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, @@ -132,7 +132,7 @@ static TAO::TypeCode::Struct<char const *, "ThreadpoolLane", _tao_fields_RTCORBA_ThreadpoolLane, 3); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane = @@ -158,10 +158,10 @@ namespace TAO CORBA::tk_sequence, &RTCORBA::_tc_ThreadpoolLane, 0U); - + ::CORBA::TypeCode_ptr const tc_RTCORBA_ThreadpoolLanes_0 = &RTCORBA_ThreadpoolLanes_0; - + } } @@ -171,7 +171,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0", "ThreadpoolLanes", &TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes = @@ -187,7 +187,7 @@ static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_RTCORBA_Pr { { "CLIENT_PROPAGATED" }, { "SERVER_DECLARED" } - + }; static TAO::TypeCode::Enum<char const *, @@ -198,7 +198,7 @@ static TAO::TypeCode::Enum<char const *, "PriorityModel", _tao_enumerators_RTCORBA_PriorityModel, 2); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PriorityModel = @@ -216,7 +216,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_PriorityModelPolicy ( "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0", "PriorityModelPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy = @@ -234,7 +234,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_ThreadpoolPolicy ( "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0", "ThreadpoolPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy = @@ -252,7 +252,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_ProtocolProperties ( "IDL:omg.org/RTCORBA/ProtocolProperties:1.0", "ProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ProtocolProperties = @@ -269,7 +269,7 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_RTCORBA_Protocol[] { "protocol_type", &IOP::_tc_ProfileId }, { "orb_protocol_properties", &RTCORBA::_tc_ProtocolProperties }, { "transport_protocol_properties", &RTCORBA::_tc_ProtocolProperties } - + }; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, @@ -280,7 +280,7 @@ static TAO::TypeCode::Struct<char const *, "Protocol", _tao_fields_RTCORBA_Protocol, 3); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_Protocol = @@ -306,10 +306,10 @@ namespace TAO CORBA::tk_sequence, &RTCORBA::_tc_Protocol, 0U); - + ::CORBA::TypeCode_ptr const tc_RTCORBA_ProtocolList_0 = &RTCORBA_ProtocolList_0; - + } } @@ -319,7 +319,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/ProtocolList:1.0", "ProtocolList", &TAO::TypeCode::tc_RTCORBA_ProtocolList_0); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ProtocolList = @@ -337,7 +337,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_ServerProtocolPolicy ( "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0", "ServerProtocolPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy = @@ -355,7 +355,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_ClientProtocolPolicy ( "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0", "ClientProtocolPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy = @@ -373,7 +373,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_PrivateConnectionPolicy ( "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0", "PrivateConnectionPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy = @@ -391,7 +391,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_TCPProtocolProperties ( "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0", "TCPProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties = @@ -409,7 +409,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_GIOPProtocolProperties ( "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0", "GIOPProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties = @@ -427,7 +427,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_UnixDomainProtocolProperties ( "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0", "UnixDomainProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties = @@ -445,7 +445,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_SharedMemoryProtocolProperties ( "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0", "SharedMemoryProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties = @@ -463,7 +463,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_UserDatagramProtocolProperties ( "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0", "UserDatagramProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties = @@ -481,7 +481,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_StreamControlProtocolProperties ( "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0", "StreamControlProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties = @@ -497,7 +497,7 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_RTCORBA_PriorityBan { { "low", &RTCORBA::_tc_Priority }, { "high", &RTCORBA::_tc_Priority } - + }; static TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *> const *, @@ -508,7 +508,7 @@ static TAO::TypeCode::Struct<char const *, "PriorityBand", _tao_fields_RTCORBA_PriorityBand, 2); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PriorityBand = @@ -534,10 +534,10 @@ namespace TAO CORBA::tk_sequence, &RTCORBA::_tc_PriorityBand, 0U); - + ::CORBA::TypeCode_ptr const tc_RTCORBA_PriorityBands_0 = &RTCORBA_PriorityBands_0; - + } } @@ -547,7 +547,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/RTCORBA/PriorityBands:1.0", "PriorityBands", &TAO::TypeCode::tc_RTCORBA_PriorityBands_0); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PriorityBands = @@ -565,7 +565,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_PriorityBandedConnectionPolicy ( "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0", "PriorityBandedConnectionPolicy"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy = @@ -583,7 +583,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_Current ( "IDL:omg.org/RTCORBA/Current:1.0", "Current"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_Current = @@ -601,7 +601,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_Mutex ( "IDL:omg.org/RTCORBA/Mutex:1.0", "Mutex"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_Mutex = @@ -623,7 +623,7 @@ static TAO::TypeCode::Struct<char const *, "MutexNotFound", _tao_fields_RTCORBA_RTORB_MutexNotFound, 0); - + ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound = &_tao_tc_RTCORBA_RTORB_MutexNotFound; @@ -640,7 +640,7 @@ static TAO::TypeCode::Struct<char const *, "InvalidThreadpool", _tao_fields_RTCORBA_RTORB_InvalidThreadpool, 0); - + ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool = &_tao_tc_RTCORBA_RTORB_InvalidThreadpool; @@ -653,7 +653,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_RTCORBA_RTORB ( "IDL:omg.org/RTCORBA/RTORB:1.0", "RTORB"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_RTORB = @@ -662,7 +662,7 @@ namespace RTCORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -720,7 +720,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -802,7 +802,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract ( _tao_any, RTCORBA::_tc_PriorityModel, - _tao_elem + _tao_elem ); } @@ -1013,19 +1013,19 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &) { return false; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &) { @@ -1085,19 +1085,19 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_sequence/any_op_cs.cpp:54 -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &) { return false; } -ACE_TEMPLATE_SPECIALIZATION +template<> CORBA::Boolean TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &) { @@ -1778,7 +1778,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -1836,7 +1836,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -2170,7 +2170,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -2242,7 +2242,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/any_op_cs.cpp:50 template<> @@ -2568,4 +2568,4 @@ CORBA::Boolean operator>>= ( RTCORBA::RTORB \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index fccbccbb688..03ad7846390 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -212,7 +212,7 @@ operator>> (TAO_InputCDR&, CORBA::ValueBase *&); /// Used in generated code if CORBA::ValueBase is an argument or return type. namespace TAO { - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_Valuetype_Export Arg_Traits<CORBA::ValueBase> : public Object_Arg_Traits_T<CORBA::ValueBase *, CORBA::ValueBase_var, @@ -222,7 +222,7 @@ namespace TAO }; - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase> { static void add_ref (CORBA::ValueBase *); diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 97d9f54e833..9d1274e8e57 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -81,7 +81,7 @@ namespace TAO /** * @brief Specializations needed for using with Value_Var_T */ - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Valuetype_Export Value_Traits<CORBA::ValueFactoryBase> { static void add_ref (CORBA::ValueFactoryBase *); |