diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-24 12:58:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-24 12:58:30 +0000 |
| commit | f248a3b7d74110aa00ab84b5bb2a488df8f31cf8 (patch) | |
| tree | edcfcc50ae7783a23ad9bb24c5cc01efa09d50ac | |
| parent | d2048fbb867e4a2397cb5b31e2f2f55d00033d5d (diff) | |
| download | ATCD-f248a3b7d74110aa00ab84b5bb2a488df8f31cf8.tar.gz | |
ChangeLogTag: Thu Mar 24 12:54:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/ORBInitInfo.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Object.h | 6 | ||||
| -rw-r--r-- | TAO/tao/Sequence.h | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ede8fd4d861..e7a0c9f79e8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 24 12:54:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: + Generate template<> instead of ACE_TEMPLATE_SPECIALIZATION + Thu Mar 24 10:06:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp: diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h index ef3bb89cc46..de819fbe6bc 100644 --- a/TAO/tao/ORBInitInfo.h +++ b/TAO/tao/ORBInitInfo.h @@ -270,7 +270,7 @@ private: namespace TAO { // Hand crafted. Not forward declared, but used by PortableServer. - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits<TAO_ORBInitInfo> { static TAO_ORBInitInfo_ptr duplicate ( diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 63736473fb5..7db531bc153 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -403,7 +403,7 @@ namespace CORBA namespace TAO { - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_Export Arg_Traits<CORBA::Object> : public Object_Arg_Traits_T<CORBA::Object_ptr, CORBA::Object_var, @@ -412,7 +412,7 @@ namespace TAO { }; - ACE_TEMPLATE_SPECIALIZATION + template<> struct TAO_Export Objref_Traits<CORBA::Object> { static CORBA::Object_ptr duplicate (CORBA::Object_ptr); @@ -428,7 +428,7 @@ namespace TAO * @brief Specialization for CORBA::Object, necessitated since we * don't have an Any insertion operator for Object. */ - ACE_TEMPLATE_SPECIALIZATION + template<> class TAO_Export Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var> : public Argument { diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index d38d3413b54..0ec96ff9a8d 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -536,7 +536,6 @@ template<class T> class TAO_Unbounded_Sequence; // The template itself requires this file so every user of the // template should also see the specialization. -ACE_TEMPLATE_SPECIALIZATION /** * @class TAO_Unbounded_Sequence<CORBA::Octet> * @@ -549,6 +548,7 @@ ACE_TEMPLATE_SPECIALIZATION * Specializing the TAO_Unbounded_Sequence<T> parametric * class, is an excellent way to achieve this optimizations. */ +template<> class TAO_Export TAO_Unbounded_Sequence<CORBA::Octet> : public TAO_Unbounded_Base_Sequence { |