*** empty log message ***

9 files changed, 144 insertions, 1488 deletions

diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index f3d1b7953b6..107ffa6649a 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -689,8 +689,8 @@ CORBA::Boolean operator>> (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_
+#if !defined (_CORBA_POLICY__ARG_TRAITS_EXPLICIT_CS_)
+#define _CORBA_POLICY__ARG_TRAITS_EXPLICIT_CS_
 
   template class TAO::Arg_Traits<CORBA::Policy>;
 
@@ -704,8 +704,8 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_EXPLICIT_CS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_EXPLICIT_CS_
 
   template class TAO::Arg_Traits<CORBA::InterfaceDef>;
 
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index 0f13d63b0b1..620197f3339 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -56,59 +56,59 @@ static const CORBA::Long _oc_Dynamic_Parameter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x723a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x723a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
     10,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
   ACE_NTOHL (0x72000000),  // name = Parameter
   2, // member count
     9,
-  ACE_NTOHL (0x61726775), 
-  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x61726775),
+  ACE_NTOHL (0x6d656e74),
   ACE_NTOHL (0x0),  // name = argument
     CORBA::tk_any,
 
   5,
-  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x6d6f6465),
   ACE_NTOHL (0x0),  // name = mode
     CORBA::tk_enum, // typecode kind
   116, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72616d65), 
-    ACE_NTOHL (0x7465724d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72616d65),
+    ACE_NTOHL (0x7465724d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
     14,
-    ACE_NTOHL (0x50617261), 
-    ACE_NTOHL (0x6d657465), 
-    ACE_NTOHL (0x724d6f64), 
+    ACE_NTOHL (0x50617261),
+    ACE_NTOHL (0x6d657465),
+    ACE_NTOHL (0x724d6f64),
     ACE_NTOHL (0x65000000),  // name = ParameterMode
     3, // member count
     9,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x0),  // name = PARAM_IN
     10,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f4f55), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f4f55),
     ACE_NTOHL (0x54000000),  // name = PARAM_OUT
     12,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
     ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-    
+
 };
 
 static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
@@ -125,10 +125,10 @@ namespace Dynamic
     &_tc_TAO_tc_Dynamic_Parameter;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 Dynamic::Parameter::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -138,7 +138,7 @@ Dynamic::Parameter::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -201,28 +201,6 @@ CORBA::Boolean operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if 0
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::SetOverrideType
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::TCKind
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::exception_type
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::ParameterMode
-      >;
-#endif /*if 0*/
-
   template class
     TAO_Var_Var_T<
         Dynamic::Parameter
@@ -247,26 +225,6 @@ CORBA::Boolean operator>>= (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::SetOverrideType \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::TCKind \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::exception_type \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::ParameterMode \
-      >
-
-# pragma instantiate \
     TAO_Var_Var_T< \
         Dynamic::Parameter \
       >
@@ -287,5 +245,4 @@ CORBA::Boolean operator>>= (
         Dynamic::Parameter \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index 3ab27818f61..869454b87ed 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -1285,102 +1285,9 @@ operator>>= (
 
 // TAO_IDL - Generated from
 // be/be_visitor_root/root.cpp:1703
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if 0
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::SetOverrideType
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::PolicyError
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::InvalidPolicies
-      >;
-#endif /*if 0*/
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::OctetSeq>;
-
-#if 0
-  template class
-    TAO::Var_Size_Arg_Traits<
-        CORBA::OctetSeq,
-        CORBA::OctetSeq_var,
-        CORBA::OctetSeq_out
-      >;
-#endif /*if 0*/
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::TCKind
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::exception_type
-      >;
-#endif /*if 0*/
-
-#if !defined (_IOP_CODEC__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_CODEC__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::Codec>;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        IOP::Codec_ptr,
-        IOP::Codec_var,
-        IOP::Codec_out,
-        TAO::Objref_Traits<IOP::Codec>
-      >;
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::InvalidTypeForEncoding
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::FormatMismatch
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::TypeMismatch
-      >;
-
-  template class
-    TAO::Ret_Var_Size_Argument_T<
-        CORBA::sequence,
-        CORBA::sequence_var
-      >;
-
-  template class
-    TAO::In_Var_Size_Argument_T<
-        CORBA::sequence
-      >;
-#endif /*if 0*/
-
-  template class
-    TAO::Any_Impl_T<
-        IOP::Codec
-      >;
-
+  template class TAO::Objref_Traits<IOP::Codec>;
 
   template class
     TAO_Objref_Var_T<
@@ -1392,20 +1299,10 @@ operator>>= (
         IOP::Codec
       >;
 
-
-#if !defined (_IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::Encoding>;
-
-#if 0
   template class
-    TAO::Fixed_Size_Arg_Traits<
-        IOP::Encoding
+    TAO::Any_Impl_T<
+        IOP::Codec
       >;
-#endif /*if 0*/
-
-#endif /* end #if !defined */
 
   template class
     TAO_Fixed_Var_T<
@@ -1417,31 +1314,12 @@ operator>>= (
         IOP::Encoding
       >;
 
-
   template class
     TAO::Any_Dual_Impl_T<
         IOP::Encoding
       >;
 
-#if 0
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::CodecFactory::UnknownEncoding
-      >;
-#endif /*if 0*/
-
-#if 0
-  template class
-    TAO::Ret_Object_Argument_T<
-        IOP::Codec_ptr,
-        IOP::Codec_var
-      >;
-#endif /*if 0*/
-
-  template class
-    TAO::In_Fixed_Size_Argument_T<
-        IOP::Encoding
-      >;
+  template class TAO::Objref_Traits<IOP::CodecFactory>;
 
   template class
     TAO_Objref_Var_T<
@@ -1460,89 +1338,16 @@ operator>>= (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::SetOverrideType \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::PolicyError \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::InvalidPolicies \
-      >
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        CORBA::OctetSeq, \
-        CORBA::OctetSeq_var, \
-        CORBA::OctetSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::TCKind \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::exception_type \
-      >
-
-#if !defined (_IOP_CODEC__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_CODEC__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::Codec>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        IOP::Codec_ptr, \
-        IOP::Codec_var, \
-        IOP::Codec_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::InvalidTypeForEncoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::FormatMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::TypeMismatch \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_Argument_T< \
-        CORBA::sequence \
-      >
+# pragma instantiate TAO::Objref_Traits<IOP::Codec>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        IOP::Codec, \
-        TAO::Objref_Traits<IOP::Codec> \
+        IOP::Codec
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        IOP::Codec, \
-        TAO::Objref_Traits<IOP::Codec> \
+        IOP::Codec
       >
 
 # pragma instantiate \
@@ -1550,18 +1355,6 @@ operator>>= (
         IOP::Codec \
       >
 
-#if !defined (_IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::Encoding>
-
-# pragma instantiate \
-    TAO::Fixed_Size_Arg_Traits< \
-        IOP::Encoding \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO_Fixed_Var_T< \
         IOP::Encoding \
@@ -1577,26 +1370,16 @@ operator>>= (
         IOP::Encoding \
       >
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::CodecFactory::UnknownEncoding \
-      >
-
-# pragma instantiate \
-    TAO::In_Fixed_Size_Argument_T< \
-        IOP::Encoding \
-      >
+# pragma instantiate TAO::Objref_Traits<IOP::CodecFactory>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        IOP::CodecFactory, \
-        TAO::Objref_Traits<IOP::CodecFactory> \
+        IOP::CodecFactory
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        IOP::CodecFactory, \
-        TAO::Objref_Traits<IOP::CodecFactory> \
+        IOP::CodecFactory
       >
 
 # pragma instantiate \
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 13965b0a96d..79cba5e8a19 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -2264,44 +2264,6 @@ CORBA::Boolean operator>> (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if 0
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::SetOverrideType
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::PolicyError
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::InvalidPolicies
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::TCKind
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::exception_type
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::ParameterMode
-      >;
-#endif /*if 0*/
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::TaggedProfile
-      >;
-
-
   template class
     TAO_Var_Var_T<
         IOP::TaggedProfile
@@ -2318,17 +2280,11 @@ CORBA::Boolean operator>> (
         IOP::TaggedProfile_var
       >;
 
-
-#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__SEQUENCE_CS_)
-#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__SEQUENCE_CS_
-
   template class
-    TAO_Unbounded_Sequence<
+    TAO::Any_Dual_Impl_T<
         IOP::TaggedProfile
       >;
 
-#endif /* end #if !defined */
-
   template class
     TAO::Any_Dual_Impl_T<
         IOP::IOR::_tao_seq_IOP_TaggedProfile_
@@ -2355,7 +2311,6 @@ CORBA::Boolean operator>> (
         IOP::IOR
       >;
 
-
   template class
     TAO_Var_Var_T<
         IOP::TaggedComponent
@@ -2396,14 +2351,15 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent
       >;
 
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_)
-#define _IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_
+#if !defined (_IOP_MULTIPLECOMPONENTPROFILE__EXPLICIT_CS_)
+#define _IOP_MULTIPLECOMPONENTPROFILE__EXPLICIT_CS_
 
   template class
     TAO_Unbounded_Sequence<
         IOP::TaggedComponent
       >;
-#endif /*#!if */
+
+#endif /* end #if !defined */
 
   template class
     TAO::Any_Dual_Impl_T<
@@ -2429,16 +2385,6 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent
       >;
 
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_)
-#define _IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_
-
-  template class
-    TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Any_Dual_Impl_T<
         IOP::TaggedComponentList
@@ -2463,15 +2409,6 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent
       >;
 
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_)
-#define _IOP_TAGGEDCOMPONENTLIST_EXPLICIT_CS_
-
-  template class
-    TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
-      >;
-#endif /* end #if !defined */
-
   template class
     TAO::Any_Dual_Impl_T<
         IOP::TaggedComponentSeq
@@ -2522,8 +2459,8 @@ CORBA::Boolean operator>> (
         IOP::ServiceContext
       >;
 
-#if !defined (_IOP_SERVICECONTEXTLIST_SEQUENCE_CS_)
-#define _IOP_SERVICECONTEXTLIST_SEQUENCE_CS_
+#if !defined (_IOP_SERVICECONTEXTLIST__EXPLICIT_CS_)
+#define _IOP_SERVICECONTEXTLIST__EXPLICIT_CS_
 
   template class
     TAO_Unbounded_Sequence<
@@ -2540,36 +2477,6 @@ CORBA::Boolean operator>> (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::SetOverrideType \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::PolicyError \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::InvalidPolicies \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::TCKind \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::exception_type \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::ParameterMode \
-      >
-
-# pragma instantiate \
     TAO_Var_Var_T< \
         IOP::TaggedProfile \
       >
@@ -2590,8 +2497,8 @@ CORBA::Boolean operator>> (
         IOP::TaggedProfile \
       >
 
-#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_)
-#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_
+#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE___EXPLICIT_CS_)
+#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE___EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
@@ -2666,8 +2573,8 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent \
       >
 
-#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
-#define _IOP_MULTIPLECOMPONENTPROFILE_CS_
+#if !defined (_IOP_MULTIPLECOMPONENTPROFILE__EXPLICIT_CS_)
+#define _IOP_MULTIPLECOMPONENTPROFILE__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
@@ -2700,8 +2607,8 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent \
       >
 
-#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
-#define _IOP_TAGGEDCOMPONENTLIST_CS_
+#if !defined (_IOP_TAGGEDCOMPONENTLIST__EXPLICIT_CS_)
+#define _IOP_TAGGEDCOMPONENTLIST__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
@@ -2734,8 +2641,8 @@ CORBA::Boolean operator>> (
         IOP::TaggedComponent \
       >
 
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CS_
+#if !defined (_IOP_TAGGEDCOMPONENTSEQ__EXPLICIT_CS_)
+#define _IOP_TAGGEDCOMPONENTSEQ__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
@@ -2794,8 +2701,8 @@ CORBA::Boolean operator>> (
         IOP::ServiceContext \
       >
 
-#if !defined (_IOP_SERVICECONTEXTLIST_CS_)
-#define _IOP_SERVICECONTEXTLIST_CS_
+#if !defined (_IOP_SERVICECONTEXTLIST__EXPLICIT_CS_)
+#define _IOP_SERVICECONTEXTLIST__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 626dd857e77..a19e460d971 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -624,70 +624,11 @@ CORBA::Boolean operator>> (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if 0
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::SetOverrideType
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::PolicyError
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::InvalidPolicies
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::TCKind
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::exception_type
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::ParameterMode
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::InvalidTypeForEncoding
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::FormatMismatch
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::TypeMismatch
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::CodecFactory::UnknownEncoding
-      >;
-
   template class
     TAO::Any_Dual_Impl_T<
         Messaging::PolicyValue::_tao_seq_CORBA_Octet_
       >;
 
-#endif /*if 0*/
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        Messaging::PolicyValue
-      >;
-
-
   template class
     TAO_Var_Var_T<
         Messaging::PolicyValue
@@ -705,6 +646,11 @@ CORBA::Boolean operator>> (
       >;
 
   template class
+    TAO::Any_Dual_Impl_T<
+        Messaging::PolicyValue
+      >;
+
+  template class
     TAO_VarSeq_Var_T<
         Messaging::PolicyValueSeq,
         Messaging::PolicyValue
@@ -723,8 +669,8 @@ CORBA::Boolean operator>> (
         Messaging::PolicyValue
       >;
 
-#if !defined (_MESSAGING_POLICYVALUESEQ_EXPLICIT_CS_)
-#define _MESSAGING_POLICYVALUESEQ_EXPLICIT_CS_
+#if !defined (_MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_)
+#define _MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_
 
   template class
     TAO_Unbounded_Sequence<
@@ -741,56 +687,6 @@ CORBA::Boolean operator>> (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::SetOverrideType \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::PolicyError \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::InvalidPolicies \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::TCKind \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::exception_type \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::ParameterMode \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::InvalidTypeForEncoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::FormatMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::TypeMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::CodecFactory::UnknownEncoding \
-      >
-
-# pragma instantiate \
     TAO::Any_Dual_Impl_T< \
         Messaging::PolicyValue::_tao_seq_CORBA_Octet_ \
       >
@@ -835,8 +731,8 @@ CORBA::Boolean operator>> (
         Messaging::PolicyValue \
       >
 
-#if !defined (_MESSAGING_POLICYVALUESEQ_CS_)
-#define _MESSAGING_POLICYVALUESEQ_CS_
+#if !defined (_MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_)
+#define _MESSAGING_POLICYVALUESEQ__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Sequence< \
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 69825d3a375..582d6e06f1d 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -647,14 +647,6 @@ CORBA::Boolean operator>> (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-  template class TAO::Objref_Traits<CORBA::Policy>;
-
-  /*template class
-    TAO::Any_Impl_T<
-        CORBA::Policy
-      >;
-  */
-
   template class
     TAO_Object_Manager<
         CORBA::Policy,
@@ -689,8 +681,8 @@ CORBA::Boolean operator>> (
           >
       >;
 
-#if !defined (_CORBA_POLICYLIST_EXPLICIT_CS_)
-#define _CORBA_POLICYLIST_EXPLICIT_CS_
+#if !defined (_CORBA_POLICYLIST__EXPLICIT_CS_)
+#define _CORBA_POLICYLIST__EXPLICIT_CS_
 
   template class
     TAO_Unbounded_Object_Sequence<
@@ -736,13 +728,6 @@ CORBA::Boolean operator>> (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-# pragma instantiate TAO::Objref_Traits<CORBA::Policy>
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        CORBA::Policy \
-      >
-
 # pragma instantiate \
     TAO_MngSeq_Var_T< \
         CORBA::PolicyList, \
@@ -771,8 +756,8 @@ CORBA::Boolean operator>> (
           > \
       >
 
-#if !defined (_CORBA_POLICYLIST_CS_)
-#define _CORBA_POLICYLIST_CS_
+#if !defined (_CORBA_POLICYLIST__EXPLICIT_CS_)
+#define _CORBA_POLICYLIST__EXPLICIT_CS_
 
 # pragma instantiate \
     TAO_Unbounded_Object_Sequence< \
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 8c2302debab..abde9255d7c 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -643,40 +643,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::PollableSet>;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::PollableSet_ptr,
-        CORBA::PollableSet_var,
-        CORBA::PollableSet_out,
-	TAO::Objref_Traits<CORBA::PollableSet>
-      >;
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Ret_Object_Argument_T<
-        CORBA::DIIPollable_ptr,
-        CORBA::DIIPollable_var
-      >;
-
-  template class
-    TAO::Ret_Object_Argument_T<
-        CORBA::Pollable_ptr,
-        CORBA::Pollable_var
-      >;
-#endif /*if 0*/
-
-  template class
-    TAO::In_Object_Argument_T<
-        CORBA::Pollable_ptr
-      >;
-
+  template class TAO::Objref_Traits<CORBA::PollableSet>;
 
   template class
     TAO_Objref_Var_T<
@@ -688,28 +655,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
         CORBA::PollableSet
       >;
 
-#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::Pollable>;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Pollable_ptr,
-        CORBA::Pollable_var,
-        CORBA::Pollable_out,
-	TAO::Objref_Traits<CORBA::Pollable>
-      >;
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Ret_Object_Argument_T<
-        CORBA::PollableSet_ptr,
-        CORBA::PollableSet_var
-      >;
-#endif /*if 0*/
+  template class TAO::Objref_Traits<CORBA::Pollable>;
 
   template class
     TAO_Objref_Var_T<
@@ -721,20 +667,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
         CORBA::Pollable
       >;
 
-#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::DIIPollable>;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::DIIPollable_ptr,
-        CORBA::DIIPollable_var,
-        CORBA::DIIPollable_out,
-	TAO::Objref_Traits<CORBA::DIIPollable>
-      >;
-
-#endif /* end #if !defined */
+  template class TAO::Objref_Traits<CORBA::DIIPollable>;
 
   template class
     TAO_Objref_Var_T<
@@ -748,87 +681,45 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::PollableSet>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::PollableSet_ptr, \
-        CORBA::PollableSet_var, \
-        CORBA::PollableSet_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        CORBA::Pollable_ptr \
-      >
+# pragma instantiate TAO::Objref_Traits<CORBA::PollableSet>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        CORBA::PollableSet, \
-        TAO::Objref_Traits<CORBA::PollableSet> \
+        CORBA::PollableSet
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        CORBA::PollableSet, \
-        TAO::Objref_Traits<CORBA::PollableSet> \
-      >
-
-#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::Pollable>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Pollable_ptr, \
-        CORBA::Pollable_var, \
-        CORBA::Pollable_out \
+        CORBA::PollableSet
       >
 
-#endif /* end #if !defined */
+# pragma instantiate TAO::Objref_Traits<CORBA::Pollable>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        CORBA::Pollable, \
-        TAO::Objref_Traits<CORBA::Pollable> \
+        CORBA::Pollable
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        CORBA::Pollable, \
-        TAO::Objref_Traits<CORBA::Pollable> \
+        CORBA::Pollable
       >
 
-#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::DIIPollable>
+# pragma instantiate TAO::Objref_Traits<CORBA::DIIPollable>
 
 # pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::DIIPollable_ptr, \
-        CORBA::DIIPollable_var, \
-        CORBA::DIIPollable_out \
+    TAO_Objref_Var_T< \
+        CORBA::DIIPollable
       >
 
-#endif /* end #if !defined */
-
 # pragma instantiate \
-    TAO_Objref_Var_T< \
-        CORBA::DIIPollable, \
-        TAO::Objref_Traits<CORBA::DIIPollable> \
+    TAO_Objref_Out_T< \
+        CORBA::DIIPollable
       >
 
 # pragma instantiate \
-    TAO_Objref_Out_T< \
-        CORBA::DIIPollable, \
-        TAO::Objref_Traits<CORBA::DIIPollable> \
+    TAO::Any_Impl_T< \
+        CORBA::DIIPollable \
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index b1d51dfad45..17f73ce292f 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -3374,228 +3374,7 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::OctetSeq>;
-
-/*
-  template class
-    TAO::Var_Size_Arg_Traits<
-        CORBA::OctetSeq,
-        CORBA::OctetSeq_var,
-        CORBA::OctetSeq_out
-      >;
-*/
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::StringSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits<
-        CORBA::StringSeq,
-        CORBA::StringSeq_var,
-        CORBA::StringSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::Policy>;
-
-/*
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var,
-        CORBA::Policy_out
-      >;
-*/
-
-#endif /* end #if !defined */
-
-/*
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::SetOverrideType
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::PolicyError
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        CORBA::InvalidPolicies
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::TCKind
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::exception_type
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        CORBA::ParameterMode
-      >;
-*/
-
-#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<Dynamic::ParameterList>;
-
-/*
-  template class
-    TAO::Var_Size_Arg_Traits<
-        Dynamic::ParameterList,
-        Dynamic::ParameterList_var,
-        Dynamic::ParameterList_out
-      >;
-*/
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<Dynamic::ExceptionList>;
-
-  template class
-    TAO::Var_Size_Arg_Traits<
-        Dynamic::ExceptionList,
-        Dynamic::ExceptionList_var,
-        Dynamic::ExceptionList_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::TaggedProfile>;
-
-/*
-  template class
-    TAO::Var_Size_Arg_Traits<
-        IOP::TaggedProfile,
-        IOP::TaggedProfile_var,
-        IOP::TaggedProfile_out
-      >;
-*/
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::TaggedComponent>;
-
-#if 0
-  template class
-    TAO::Var_Size_Arg_Traits<
-        IOP::TaggedComponent,
-        IOP::TaggedComponent_var,
-        IOP::TaggedComponent_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::TaggedComponentSeq>;
-
-#if 0
-  template class
-    TAO::Var_Size_Arg_Traits<
-        IOP::TaggedComponentSeq,
-        IOP::TaggedComponentSeq_var,
-        IOP::TaggedComponentSeq_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::ServiceContext>;
-
-#if 0
-  template class
-    TAO::Var_Size_Arg_Traits<
-        IOP::ServiceContext,
-        IOP::ServiceContext_var,
-        IOP::ServiceContext_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::InvalidTypeForEncoding
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::FormatMismatch
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::TypeMismatch
-      >;
-#endif /*if 0*/
-
-#if !defined (_IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<IOP::CodecFactory>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        IOP::CodecFactory_ptr,
-        IOP::CodecFactory_var,
-        IOP::CodecFactory_out
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::CodecFactory::UnknownEncoding
-      >;
-
-#endif /*if 0*/
-
-#endif /* end #if !defined */
-
- template class
-    TAO::Any_Dual_Impl_T<
-        PortableInterceptor::ForwardRequest
-      >;
-
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableInterceptor::InvalidSlot
-      >;
-
+  template class TAO::Objref_Traits<PortableInterceptor::Interceptor>;
 
   template class
     TAO_Objref_Var_T<
@@ -3611,6 +3390,9 @@ operator>>= (
     TAO::Any_Impl_T<
         PortableInterceptor::Interceptor
       >;
+
+  template class TAO::Objref_Traits<PortableInterceptor::Current>;
+
   template class
     TAO_Objref_Var_T<
         PortableInterceptor::Current
@@ -3626,13 +3408,7 @@ operator>>= (
         PortableInterceptor::Current
       >;
 
-#if 0
-  template class
-    TAO::Ret_Var_Size_Argument_T<
-        IOP::ServiceContext,
-        IOP::ServiceContext_var
-      >;
-#endif
+  template class TAO::Objref_Traits<PortableInterceptor::RequestInfo>;
 
   template class
     TAO_Objref_Var_T<
@@ -3649,48 +3425,7 @@ operator>>= (
         PortableInterceptor::RequestInfo
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::ClientRequestInfo_ptr,
-        PortableInterceptor::ClientRequestInfo_var,
-        PortableInterceptor::ClientRequestInfo_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-#if 0
-  template class
-    TAO::Ret_Var_Size_Argument_T<
-        IOP::TaggedComponent,
-        IOP::TaggedComponent_var
-      >;
-
-  template class
-    TAO::Ret_Var_Size_Argument_T<
-        IOP::sequence,
-        IOP::sequence_var
-      >;
-
-
-  template class
-    TAO::In_Var_Size_Argument_T<
-        IOP::ServiceContext
-      >;
-
-#endif
-
-  template class
-    TAO::Ret_Object_Argument_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var
-      >;
+  template class TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>;
 
   template class
     TAO_Objref_Var_T<
@@ -3707,21 +3442,7 @@ operator>>= (
         PortableInterceptor::ClientRequestInfo
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::ServerRequestInfo_ptr,
-        PortableInterceptor::ServerRequestInfo_var,
-        PortableInterceptor::ServerRequestInfo_out
-      >;
-#endif
-
-#endif /* end #if !defined */
+  template class TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>;
 
   template class
     TAO_Objref_Var_T<
@@ -3738,26 +3459,7 @@ operator>>= (
         PortableInterceptor::ServerRequestInfo
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::ClientRequestInterceptor>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::ClientRequestInterceptor_ptr,
-        PortableInterceptor::ClientRequestInterceptor_var,
-        PortableInterceptor::ClientRequestInterceptor_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::ClientRequestInfo_ptr
-      >;
+  template class TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>;
 
   template class
     TAO_Objref_Var_T<
@@ -3774,26 +3476,7 @@ operator>>= (
         PortableInterceptor::ClientRequestInterceptor
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::ServerRequestInterceptor>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::ServerRequestInterceptor_ptr,
-        PortableInterceptor::ServerRequestInterceptor_var,
-        PortableInterceptor::ServerRequestInterceptor_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::ServerRequestInfo_ptr
-      >;
+  template class TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>;
 
   template class
     TAO_Objref_Var_T<
@@ -3810,21 +3493,7 @@ operator>>= (
         PortableInterceptor::ServerRequestInterceptor
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::PolicyFactory>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::PolicyFactory_ptr,
-        PortableInterceptor::PolicyFactory_var,
-        PortableInterceptor::PolicyFactory_out
-      >;
-#endif
-
-#endif /* end #if !defined */
+  template class TAO::Objref_Traits<PortableInterceptor::PolicyFactory>;
 
   template class
     TAO_Objref_Var_T<
@@ -3841,320 +3510,52 @@ operator>>= (
         PortableInterceptor::PolicyFactory
       >;
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::IORInterceptor>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::IORInterceptor_ptr,
-        PortableInterceptor::IORInterceptor_var,
-        PortableInterceptor::IORInterceptor_out
-      >;
-#endif
-
-#endif /* end #if !defined */
-
-  template class TAO::Objref_Traits<PortableInterceptor::IORInterceptor>;
-
-#if 0
-  template class
-    TAO::Any_Impl_T<
-        PortableInterceptor::IORInterceptor
-      >;
-#endif
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<PortableInterceptor::ORBInitInfo>;
-
-#if 0
-  template class
-    TAO::Object_Arg_Traits_T<
-        PortableInterceptor::ORBInitInfo_ptr,
-        PortableInterceptor::ORBInitInfo_var,
-        PortableInterceptor::ORBInitInfo_out
-      >;
-#endif
-
-#endif /* end #if !defined */
+  template class TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>;
 
-#if 0
   template class
-    TAO::Any_Dual_Impl_T<
-        PortableInterceptor::ORBInitInfo::DuplicateName
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableInterceptor::ORBInitInfo::InvalidName
+    TAO_Objref_Var_T<
+        PortableInterceptor::ORBInitInfo
       >;
-#endif
 
   template class
-    TAO::Any_Impl_T<
+    TAO_Objref_Out_T<
         PortableInterceptor::ORBInitInfo
       >;
 
   template class
     TAO::Any_Impl_T<
-        PortableInterceptor::ORBInitializer
-      >;
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::ClientRequestInterceptor_ptr
-      >;
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::ServerRequestInterceptor_ptr
+        PortableInterceptor::ORBInitInfo
       >;
 
-#if 0
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::IORInterceptor_ptr
-      >;
-#endif
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::PolicyFactory_ptr
-      >;
+  template class TAO::Objref_Traits<PortableInterceptor::ORBInitializer>;
 
   template class
     TAO_Objref_Var_T<
-        PortableInterceptor::ORBInitInfo
+        PortableInterceptor::ORBInitializer
       >;
 
   template class
     TAO_Objref_Out_T<
-        PortableInterceptor::ORBInitInfo
-      >;
-
-
-  template class
-    TAO::In_Object_Argument_T<
-        PortableInterceptor::ORBInitInfo_ptr
-      >;
-
-  template class
-    TAO_Objref_Var_T<
         PortableInterceptor::ORBInitializer
       >;
 
   template class
-    TAO_Objref_Out_T<
+    TAO::Any_Impl_T<
         PortableInterceptor::ORBInitializer
       >;
 
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        CORBA::OctetSeq, \
-        CORBA::OctetSeq_var, \
-        CORBA::OctetSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::StringSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        CORBA::StringSeq, \
-        CORBA::StringSeq_var, \
-        CORBA::StringSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::Policy>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Policy_ptr, \
-        CORBA::Policy_var, \
-        CORBA::Policy_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::SetOverrideType \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::PolicyError \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        CORBA::InvalidPolicies \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::TCKind \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::exception_type \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        CORBA::ParameterMode \
-      >
-
-#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<Dynamic::ParameterList>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        Dynamic::ParameterList, \
-        Dynamic::ParameterList_var, \
-        Dynamic::ParameterList_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<Dynamic::ExceptionList>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        Dynamic::ExceptionList, \
-        Dynamic::ExceptionList_var, \
-        Dynamic::ExceptionList_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::TaggedProfile>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        IOP::TaggedProfile, \
-        IOP::TaggedProfile_var, \
-        IOP::TaggedProfile_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::TaggedComponent>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        IOP::TaggedComponent, \
-        IOP::TaggedComponent_var, \
-        IOP::TaggedComponent_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::TaggedComponentSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        IOP::TaggedComponentSeq, \
-        IOP::TaggedComponentSeq_var, \
-        IOP::TaggedComponentSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::ServiceContext>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits< \
-        IOP::ServiceContext, \
-        IOP::ServiceContext_var, \
-        IOP::ServiceContext_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::InvalidTypeForEncoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::FormatMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::TypeMismatch \
-      >
-
-#if !defined (_IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_)
-#define _IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<IOP::CodecFactory>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        IOP::CodecFactory_ptr, \
-        IOP::CodecFactory_var, \
-        IOP::CodecFactory_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::CodecFactory::UnknownEncoding \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::Interceptor>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::Interceptor, \
-        TAO::Objref_Traits<PortableInterceptor::Interceptor> \
+        PortableInterceptor::Interceptor
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::Interceptor, \
-        TAO::Objref_Traits<PortableInterceptor::Interceptor> \
+        PortableInterceptor::Interceptor
       >
 
 # pragma instantiate \
@@ -4162,26 +3563,16 @@ operator>>= (
         PortableInterceptor::Interceptor \
       >
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableInterceptor::ForwardRequest \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableInterceptor::InvalidSlot \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::Current>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::Current, \
-        TAO::Objref_Traits<PortableInterceptor::Current> \
+        PortableInterceptor::Current
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::Current, \
-        TAO::Objref_Traits<PortableInterceptor::Current> \
+        PortableInterceptor::Current
       >
 
 # pragma instantiate \
@@ -4189,16 +3580,16 @@ operator>>= (
         PortableInterceptor::Current \
       >
 
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::RequestInfo>
+
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::RequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::RequestInfo> \
+        PortableInterceptor::RequestInfo
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::RequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::RequestInfo> \
+        PortableInterceptor::RequestInfo
       >
 
 # pragma instantiate \
@@ -4206,35 +3597,16 @@ operator>>= (
         PortableInterceptor::RequestInfo \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::ClientRequestInfo_ptr, \
-        PortableInterceptor::ClientRequestInfo_var, \
-        PortableInterceptor::ClientRequestInfo_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_Argument_T< \
-        IOP::ServiceContext \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ClientRequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> \
+        PortableInterceptor::ClientRequestInfo
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ClientRequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> \
+        PortableInterceptor::ClientRequestInfo
       >
 
 # pragma instantiate \
@@ -4242,30 +3614,16 @@ operator>>= (
         PortableInterceptor::ClientRequestInfo \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::ServerRequestInfo_ptr, \
-        PortableInterceptor::ServerRequestInfo_var, \
-        PortableInterceptor::ServerRequestInfo_out \
-      >
-
-#endif /* end #if !defined */
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ServerRequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> \
+        PortableInterceptor::ServerRequestInfo
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ServerRequestInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> \
+        PortableInterceptor::ServerRequestInfo
       >
 
 # pragma instantiate \
@@ -4273,35 +3631,16 @@ operator>>= (
         PortableInterceptor::ServerRequestInfo \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ClientRequestInterceptor>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::ClientRequestInterceptor_ptr, \
-        PortableInterceptor::ClientRequestInterceptor_var, \
-        PortableInterceptor::ClientRequestInterceptor_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::ClientRequestInfo_ptr \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ClientRequestInterceptor, \
-        TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> \
+        PortableInterceptor::ClientRequestInterceptor
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ClientRequestInterceptor, \
-        TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> \
+        PortableInterceptor::ClientRequestInterceptor
       >
 
 # pragma instantiate \
@@ -4309,35 +3648,16 @@ operator>>= (
         PortableInterceptor::ClientRequestInterceptor \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ServerRequestInterceptor>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::ServerRequestInterceptor_ptr, \
-        PortableInterceptor::ServerRequestInterceptor_var, \
-        PortableInterceptor::ServerRequestInterceptor_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::ServerRequestInfo_ptr \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ServerRequestInterceptor, \
-        TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> \
+        PortableInterceptor::ServerRequestInterceptor
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ServerRequestInterceptor, \
-        TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> \
+        PortableInterceptor::ServerRequestInterceptor
       >
 
 # pragma instantiate \
@@ -4345,30 +3665,16 @@ operator>>= (
         PortableInterceptor::ServerRequestInterceptor \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::PolicyFactory>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::PolicyFactory_ptr, \
-        PortableInterceptor::PolicyFactory_var, \
-        PortableInterceptor::PolicyFactory_out \
-      >
-
-#endif /* end #if !defined */
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::PolicyFactory>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::PolicyFactory, \
-        TAO::Objref_Traits<PortableInterceptor::PolicyFactory> \
+        PortableInterceptor::PolicyFactory
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::PolicyFactory, \
-        TAO::Objref_Traits<PortableInterceptor::PolicyFactory> \
+        PortableInterceptor::PolicyFactory
       >
 
 # pragma instantiate \
@@ -4376,81 +3682,16 @@ operator>>= (
         PortableInterceptor::PolicyFactory \
       >
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::IORInterceptor>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::IORInterceptor_ptr, \
-        PortableInterceptor::IORInterceptor_var, \
-        PortableInterceptor::IORInterceptor_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate TAO::Objref_Traits<PortableInterceptor::IORInterceptor>
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableInterceptor::IORInterceptor \
-      >
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ORBInitInfo>
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        PortableInterceptor::ORBInitInfo_ptr, \
-        PortableInterceptor::ORBInitInfo_var, \
-        PortableInterceptor::ORBInitInfo_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableInterceptor::ORBInitInfo::DuplicateName \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableInterceptor::ORBInitInfo::InvalidName \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::ClientRequestInterceptor_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::ServerRequestInterceptor_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::IORInterceptor_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::PolicyFactory_ptr \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ORBInitInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> \
+        PortableInterceptor::ORBInitInfo
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ORBInitInfo, \
-        TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> \
+        PortableInterceptor::ORBInitInfo
       >
 
 # pragma instantiate \
@@ -4458,21 +3699,16 @@ operator>>= (
         PortableInterceptor::ORBInitInfo \
       >
 
-# pragma instantiate \
-    TAO::In_Object_Argument_T< \
-        PortableInterceptor::ORBInitInfo_ptr \
-      >
+# pragma instantiate TAO::Objref_Traits<PortableInterceptor::ORBInitializer>
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        PortableInterceptor::ORBInitializer, \
-        TAO::Objref_Traits<PortableInterceptor::ORBInitializer> \
+        PortableInterceptor::ORBInitializer
       >
 
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        PortableInterceptor::ORBInitializer, \
-        TAO::Objref_Traits<PortableInterceptor::ORBInitializer> \
+        PortableInterceptor::ORBInitializer
       >
 
 # pragma instantiate \
diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
index 451aaf08907..bd13c67cf9e 100644
--- a/TAO/tao/Valuetype/Seq_Tmplinst.cpp
+++ b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
@@ -17,6 +17,7 @@
 //     Jeff Parsons <j.parsons@vanderbilt.edu>
 //
 // ============================================================================
+#include "ace/config-all.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
     defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -28,7 +29,7 @@
 #include "ValueFactory.h"
 #endif /*if ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
 
-ACE_RCSID (tao,
+ACE_RCSID (Valuetype,
            Seq_Tmplinst,
            "$Id$")