ChangeLogTag: Sat Jul 12 14:14:18 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 478 insertions, 44 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 70c8cd659a9..51d2c712300 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,19 @@
+Sat Jul 12 14:14:18 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Basic_Arguments.cpp:
+        * tao/Special_Basic_Arguments.cpp:
+        * tao/UB_String_Arguments.cpp:
+
+          Added explicit template instantiations of the individual
+          argument direction and return value classes for the IDL
+          basic types, including unbounded (w)strings.
+
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.cpp:
+        * tao/Var_Array_Argument_T.inl:
+
+          Fixed typos and made cosmetic changes.
+
 Sat Jul 12 11:35:37 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_arg_tmplinst.cpp:
diff --git a/TAO/tao/Basic_Arguments.cpp b/TAO/tao/Basic_Arguments.cpp
index 3de4c2c48ec..e1c48dfbc43 100644
--- a/TAO/tao/Basic_Arguments.cpp
+++ b/TAO/tao/Basic_Arguments.cpp
@@ -29,27 +29,189 @@ template class TAO::Basic_Arg_Traits_T<CORBA::LongLong>;
 template class TAO::Basic_Arg_Traits_T<CORBA::ULongLong>;
 template class TAO::Basic_Arg_Traits_T<CORBA::LongDouble>;
 
+template class TAO::In_Basic_Argument_T<CORBA::Short>;
+template class TAO::Inout_Basic_Argument_T<CORBA::Short>;
+template class TAO::Out_Basic_Argument_T<CORBA::Short>;
+template class TAO::Ret_Basic_Argument_T<CORBA::Short>;
+template class TAO::In_Basic_SArgument_T<CORBA::Short>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::Short>;
+template class TAO::Out_Basic_SArgument_T<CORBA::Short>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::Short>;
+
+template class TAO::In_Basic_Argument_T<CORBA::Long>;
+template class TAO::Inout_Basic_Argument_T<CORBA::Long>;
+template class TAO::Out_Basic_Argument_T<CORBA::Long>;
+template class TAO::Ret_Basic_Argument_T<CORBA::Long>;
+template class TAO::In_Basic_SArgument_T<CORBA::Long>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::Long>;
+template class TAO::Out_Basic_SArgument_T<CORBA::Long>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::Long>;
+
+template class TAO::In_Basic_Argument_T<CORBA::UShort>;
+template class TAO::Inout_Basic_Argument_T<CORBA::UShort>;
+template class TAO::Out_Basic_Argument_T<CORBA::UShort>;
+template class TAO::Ret_Basic_Argument_T<CORBA::UShort>;
+template class TAO::In_Basic_SArgument_T<CORBA::UShort>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::UShort>;
+template class TAO::Out_Basic_SArgument_T<CORBA::UShort>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::UShort>;
+
+template class TAO::In_Basic_Argument_T<CORBA::ULong>;
+template class TAO::Inout_Basic_Argument_T<CORBA::ULong>;
+template class TAO::Out_Basic_Argument_T<CORBA::ULong>;
+template class TAO::Ret_Basic_Argument_T<CORBA::ULong>;
+template class TAO::In_Basic_SArgument_T<CORBA::ULong>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::ULong>;
+template class TAO::Out_Basic_SArgument_T<CORBA::ULong>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::ULong>;
+
+template class TAO::In_Basic_Argument_T<CORBA::Float>;
+template class TAO::Inout_Basic_Argument_T<CORBA::Float>;
+template class TAO::Out_Basic_Argument_T<CORBA::Float>;
+template class TAO::Ret_Basic_Argument_T<CORBA::Float>;
+template class TAO::In_Basic_SArgument_T<CORBA::Float>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::Float>;
+template class TAO::Out_Basic_SArgument_T<CORBA::Float>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::Float>;
+
+template class TAO::In_Basic_Argument_T<CORBA::Double>;
+template class TAO::Inout_Basic_Argument_T<CORBA::Double>;
+template class TAO::Out_Basic_Argument_T<CORBA::Double>;
+template class TAO::Ret_Basic_Argument_T<CORBA::Double>;
+template class TAO::In_Basic_SArgument_T<CORBA::Double>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::Double>;
+template class TAO::Out_Basic_SArgument_T<CORBA::Double>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::Double>;
+
+template class TAO::In_Basic_Argument_T<CORBA::LongLong>;
+template class TAO::Inout_Basic_Argument_T<CORBA::LongLong>;
+template class TAO::Out_Basic_Argument_T<CORBA::LongLong>;
+template class TAO::Ret_Basic_Argument_T<CORBA::LongLong>;
+template class TAO::In_Basic_SArgument_T<CORBA::LongLong>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::LongLong>;
+template class TAO::Out_Basic_SArgument_T<CORBA::LongLong>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::LongLong>;
+
+template class TAO::In_Basic_Argument_T<CORBA::ULongLong>;
+template class TAO::Inout_Basic_Argument_T<CORBA::ULongLong>;
+template class TAO::Out_Basic_Argument_T<CORBA::ULongLong>;
+template class TAO::Ret_Basic_Argument_T<CORBA::ULongLong>;
+template class TAO::In_Basic_SArgument_T<CORBA::ULongLong>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::ULongLong>;
+template class TAO::Out_Basic_SArgument_T<CORBA::ULongLong>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::ULongLong>;
+
+template class TAO::In_Basic_Argument_T<CORBA::LongDouble>;
+template class TAO::Inout_Basic_Argument_T<CORBA::LongDouble>;
+template class TAO::Out_Basic_Argument_T<CORBA::LongDouble>;
+template class TAO::Ret_Basic_Argument_T<CORBA::LongDouble>;
+template class TAO::In_Basic_SArgument_T<CORBA::LongDouble>;
+template class TAO::Inout_Basic_SArgument_T<CORBA::LongDouble>;
+template class TAO::Out_Basic_SArgument_T<CORBA::LongDouble>;
+template class TAO::Ret_Basic_SArgument_T<CORBA::LongDouble>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-# pragma instantiate TAO::Arg_Traits_T<void>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::Short>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::Long>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::UShort>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::ULong>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::Float>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::Double>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::LongLong>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::ULongLong>
-# pragma instantiate TAO::Arg_Traits_T<CORBA::LongDouble>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Short>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Long>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::UShort>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULong>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Float>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Double>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongLong>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULongLong>
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongDouble>
+#pragma instantiate TAO::Arg_Traits_T<void>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::Short>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::Long>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::UShort>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::ULong>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::Float>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::Double>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::LongLong>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::ULongLong>
+#pragma instantiate TAO::Arg_Traits_T<CORBA::LongDouble>
+
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Short>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Long>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::UShort>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULong>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Float>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::Double>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongLong>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::ULongLong>
+#pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::LongDouble>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Short>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Short>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Short>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Short>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Short>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Short>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Short>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Short>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Long>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Long>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Long>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Long>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Long>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Long>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Long>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Long>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::UShort>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::UShort>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::UShort>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::UShort>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::UShort>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::UShort>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::UShort>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::UShort>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::ULong>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::ULong>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::ULong>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::ULong>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::ULong>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::ULong>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::ULong>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::ULong>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Float>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Float>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Float>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Float>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Float>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Float>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Float>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Float>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::Double>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::Double>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::Double>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::Double>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::Double>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::Double>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::Double>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::Double>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::LongLong>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::LongLong>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::LongLong>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::LongLong>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::LongLong>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::LongLong>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::LongLong>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::LongLong>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::ULongLong>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::ULongLong>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::ULongLong>
+
+#pragma instantiate TAO::In_Basic_Argument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Inout_Basic_Argument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Out_Basic_Argument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Ret_Basic_Argument_T<CORBA::LongDouble>
+#pragma instantiate TAO::In_Basic_SArgument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Inout_Basic_SArgument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Out_Basic_SArgument_T<CORBA::LongDouble>
+#pragma instantiate TAO::Ret_Basic_SArgument_T<CORBA::LongDouble>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index ef542f2b531..5244c735dd7 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -94,11 +94,11 @@ TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany>::demarshal (
   )
 {
   typedef TAO::Array_Traits<S,S_slice> ARRAY_TRAITS;
-  S_slice * tmp = 0;
-  ACE_ALLOCATOR_RETURN (tmp,
+  S_slice * tmp_ptr = 0;
+  ACE_ALLOCATOR_RETURN (tmp_ptr,
                         ARRAY_TRAITS::tao_alloc (),
                         0);
-  this->x_ = tmp;
+  this->x_ = tmp_ptr;
   S_forany tmp (this->x_.ptr ());
   return cdr >> tmp;
 }
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index d81aa7ef624..7632ff9da46 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -102,10 +102,6 @@ TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_replace (CORBA::Any & any)
 // ============================================================
 
 template<typename S>
-TAO::In_Fixed_Size_SArgument_T<S>::In_Fixed_Size_SArgument_T (void)
-{}
-
-template<typename S>
 CORBA::Boolean
 TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
 {
diff --git a/TAO/tao/Special_Basic_Arguments.cpp b/TAO/tao/Special_Basic_Arguments.cpp
index 63bba52ec54..052706bea04 100644
--- a/TAO/tao/Special_Basic_Arguments.cpp
+++ b/TAO/tao/Special_Basic_Arguments.cpp
@@ -29,35 +29,235 @@ template class TAO::Special_Basic_Arg_Traits_T<CORBA::Boolean,
                                                ACE_InputCDR::to_boolean,
                                                ACE_OutputCDR::from_boolean>;
 
+template class TAO::In_Special_Basic_Argument_T<CORBA::Char,
+                                                ACE_InputCDR::to_char,
+                                                ACE_OutputCDR::from_char>;
+template class TAO::Inout_Special_Basic_Argument_T<CORBA::Char,
+                                                   ACE_InputCDR::to_char,
+                                                   ACE_OutputCDR::from_char>;
+template class TAO::Out_Special_Basic_Argument_T<CORBA::Char,
+                                                 ACE_InputCDR::to_char,
+                                                 ACE_OutputCDR::from_char>;
+template class TAO::Ret_Special_Basic_Argument_T<CORBA::Char,
+                                                 ACE_InputCDR::to_char,
+                                                 ACE_OutputCDR::from_char>;
+template class TAO::In_Special_Basic_SArgument_T<CORBA::Char,
+                                                 ACE_InputCDR::to_char,
+                                                 ACE_OutputCDR::from_char;
+template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Char,
+                                                    ACE_InputCDR::to_char,
+                                                    ACE_OutputCDR::from_char>;
+template class TAO::Out_Special_Basic_SArgument_T<CORBA::Char,
+                                                  ACE_InputCDR::to_char,
+                                                  ACE_OutputCDR::from_char>;
+template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Char,
+                                                  ACE_InputCDR::to_char,
+                                                  ACE_OutputCDR::from_char>;
+
+template class TAO::In_Special_Basic_Argument_T<CORBA::WChar,
+                                                ACE_InputCDR::to_wchar,
+                                                ACE_OutputCDR::from_wchar>;
+template class TAO::Inout_Special_Basic_Argument_T<CORBA::WChar,
+                                                   ACE_InputCDR::to_wchar,
+                                                   ACE_OutputCDR::from_wchar>;
+template class TAO::Out_Special_Basic_Argument_T<CORBA::WChar,
+                                                 ACE_InputCDR::to_wchar,
+                                                 ACE_OutputCDR::from_wchar>;
+template class TAO::Ret_Special_Basic_Argument_T<CORBA::WChar,
+                                                 ACE_InputCDR::to_wchar,
+                                                 ACE_OutputCDR::from_wchar>;
+template class TAO::In_Special_Basic_SArgument_T<CORBA::WChar,
+                                                 ACE_InputCDR::to_wchar,
+                                                 ACE_OutputCDR::from_wchar;
+template class TAO::Inout_Special_Basic_SArgument_T<CORBA::WChar,
+                                                    ACE_InputCDR::to_wchar,
+                                                    ACE_OutputCDR::from_wchar>;
+template class TAO::Out_Special_Basic_SArgument_T<CORBA::WChar,
+                                                  ACE_InputCDR::to_wchar,
+                                                  ACE_OutputCDR::from_wchar>;
+template class TAO::Ret_Special_Basic_SArgument_T<CORBA::WChar,
+                                                  ACE_InputCDR::to_wchar,
+                                                  ACE_OutputCDR::from_wchar>;
+
+template class TAO::In_Special_Basic_Argument_T<CORBA::Octet,
+                                                ACE_InputCDR::to_octet,
+                                                ACE_OutputCDR::from_octet>;
+template class TAO::Inout_Special_Basic_Argument_T<CORBA::Octet,
+                                                   ACE_InputCDR::to_octet,
+                                                   ACE_OutputCDR::from_octet>;
+template class TAO::Out_Special_Basic_Argument_T<CORBA::Octet,
+                                                 ACE_InputCDR::to_octet,
+                                                 ACE_OutputCDR::from_octet>;
+template class TAO::Ret_Special_Basic_Argument_T<CORBA::Octet,
+                                                 ACE_InputCDR::to_octet,
+                                                 ACE_OutputCDR::from_octet>;
+template class TAO::In_Special_Basic_SArgument_T<CORBA::Octet,
+                                                 ACE_InputCDR::to_octet,
+                                                 ACE_OutputCDR::from_octet;
+template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Octet,
+                                                    ACE_InputCDR::to_octet,
+                                                    ACE_OutputCDR::from_octet>;
+template class TAO::Out_Special_Basic_SArgument_T<CORBA::Octet,
+                                                  ACE_InputCDR::to_octet,
+                                                  ACE_OutputCDR::from_octet>;
+template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Octet,
+                                                  ACE_InputCDR::to_octet,
+                                                  ACE_OutputCDR::from_octet>;
+
+template class TAO::In_Special_Basic_Argument_T<CORBA::Boolean,
+                                                ACE_InputCDR::to_boolean,
+                                                ACE_OutputCDR::from_boolean>;
+template class TAO::Inout_Special_Basic_Argument_T<CORBA::Boolean,
+                                                   ACE_InputCDR::to_boolean,
+                                                   ACE_OutputCDR::from_boolean>;
+template class TAO::Out_Special_Basic_Argument_T<CORBA::Boolean,
+                                                 ACE_InputCDR::to_boolean,
+                                                 ACE_OutputCDR::from_boolean>;
+template class TAO::Ret_Special_Basic_Argument_T<CORBA::Boolean,
+                                                 ACE_InputCDR::to_boolean,
+                                                 ACE_OutputCDR::from_boolean>;
+template class TAO::In_Special_Basic_SArgument_T<CORBA::Boolean,
+                                                 ACE_InputCDR::to_boolean,
+                                                 ACE_OutputCDR::from_boolean;
+template class TAO::Inout_Special_Basic_SArgument_T<CORBA::Boolean,
+                                                    ACE_InputCDR::to_boolean,
+                                                    ACE_OutputCDR::from_boolean>;
+template class TAO::Out_Special_Basic_SArgument_T<CORBA::Boolean,
+                                                  ACE_InputCDR::to_boolean,
+                                                  ACE_OutputCDR::from_boolean>;
+template class TAO::Ret_Special_Basic_SArgument_T<CORBA::Boolean,
+                                                  ACE_InputCDR::to_boolean,
+                                                  ACE_OutputCDR::from_boolean>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-# pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_char>
-# pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_wchar>
-# pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_octet>
-# pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_boolean>
+#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_char>
+#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_wchar>
+#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_octet>
+#pragma instantiate TAO::Arg_Traits<ACE_InputCDR::to_boolean>
 
-# pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
+#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
                               CORBA::Char, \
                               ACE_InputCDR::to_char, \
                               ACE_OutputCDR::from_char \
                             >
 
-# pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
+#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
                               CORBA::WChar, \
                               ACE_InputCDR::to_wchar, \
                               ACE_OutputCDR::from_wchar \
                             >
 
-# pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
+#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
                               CORBA::Octet, \
                               ACE_InputCDR::to_octet, \
                               ACE_OutputCDR::from_octet \
                             >
 
-# pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
+#pragma instantiate TAO::Special_Basic_Arg_Traits_T< \
                               CORBA::Boolean, \
                               ACE_InputCDR::to_boolean, \
                               ACE_OutputCDR::from_boolean \
                             >
 
+#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Char, \
+                                                ACE_InputCDR::to_char, \
+                                                ACE_OutputCDR::from_char>
+#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Char, \
+                                                   ACE_InputCDR::to_char, \
+                                                   ACE_OutputCDR::from_char>
+#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Char, \
+                                                 ACE_InputCDR::to_char, \
+                                                 ACE_OutputCDR::from_char>
+#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Char, \
+                                                 ACE_InputCDR::to_char, \
+                                                 ACE_OutputCDR::from_char>
+#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Char, \
+                                                 ACE_InputCDR::to_char, \
+                                                 ACE_OutputCDR::from_char
+#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Char, \
+                                                    ACE_InputCDR::to_char, \
+                                                    ACE_OutputCDR::from_char>
+#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Char, \
+                                                  ACE_InputCDR::to_char, \
+                                                  ACE_OutputCDR::from_char>
+#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Char, \
+                                                  ACE_InputCDR::to_char, \
+                                                  ACE_OutputCDR::from_char>
+
+#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::WChar, \
+                                                ACE_InputCDR::to_wchar, \
+                                                ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::WChar, \
+                                                   ACE_InputCDR::to_wchar, \
+                                                   ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::WChar, \
+                                                 ACE_InputCDR::to_wchar, \
+                                                 ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::WChar, \
+                                                 ACE_InputCDR::to_wchar, \
+                                                 ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::WChar, \
+                                                 ACE_InputCDR::to_wchar, \
+                                                 ACE_OutputCDR::from_wchar
+#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::WChar, \
+                                                    ACE_InputCDR::to_wchar, \
+                                                    ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::WChar, \
+                                                  ACE_InputCDR::to_wchar, \
+                                                  ACE_OutputCDR::from_wchar>
+#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::WChar, \
+                                                  ACE_InputCDR::to_wchar, \
+                                                  ACE_OutputCDR::from_wchar>
+
+#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Octet, \
+                                                ACE_InputCDR::to_octet, \
+                                                ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Octet, \
+                                                   ACE_InputCDR::to_octet, \
+                                                   ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Octet, \
+                                                 ACE_InputCDR::to_octet, \
+                                                 ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Octet, \
+                                                 ACE_InputCDR::to_octet, \
+                                                 ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Octet, \
+                                                 ACE_InputCDR::to_octet, \
+                                                 ACE_OutputCDR::from_octet
+#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Octet, \
+                                                    ACE_InputCDR::to_octet, \
+                                                    ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Octet, \
+                                                  ACE_InputCDR::to_octet, \
+                                                  ACE_OutputCDR::from_octet>
+#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Octet, \
+                                                  ACE_InputCDR::to_octet, \
+                                                  ACE_OutputCDR::from_octet>
+
+#pragma instantiate TAO::In_Special_Basic_Argument_T<CORBA::Boolean, \
+                                                ACE_InputCDR::to_boolean, \
+                                                ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::Inout_Special_Basic_Argument_T<CORBA::Boolean, \
+                                                   ACE_InputCDR::to_boolean, \
+                                                   ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::Out_Special_Basic_Argument_T<CORBA::Boolean, \
+                                                 ACE_InputCDR::to_boolean, \
+                                                 ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::Ret_Special_Basic_Argument_T<CORBA::Boolean, \
+                                                 ACE_InputCDR::to_boolean, \
+                                                 ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::In_Special_Basic_SArgument_T<CORBA::Boolean, \
+                                                 ACE_InputCDR::to_boolean, \
+                                                 ACE_OutputCDR::from_boolean
+#pragma instantiate TAO::Inout_Special_Basic_SArgument_T<CORBA::Boolean, \
+                                                    ACE_InputCDR::to_boolean, \
+                                                    ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::Out_Special_Basic_SArgument_T<CORBA::Boolean, \
+                                                  ACE_InputCDR::to_boolean, \
+                                                  ACE_OutputCDR::from_boolean>
+#pragma instantiate TAO::Ret_Special_Basic_SArgument_T<CORBA::Boolean, \
+                                                  ACE_InputCDR::to_boolean, \
+                                                  ACE_OutputCDR::from_boolean>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/UB_String_Arguments.cpp b/TAO/tao/UB_String_Arguments.cpp
index 0fed9644852..ec582d3e547 100644
--- a/TAO/tao/UB_String_Arguments.cpp
+++ b/TAO/tao/UB_String_Arguments.cpp
@@ -18,16 +18,76 @@ template class TAO::UB_String_Arg_Traits_T<CORBA::WChar,
                                            CORBA::WString_var,
                                            CORBA::WString_out>;
 
+template class TAO::In_UB_String_Argument_T<CORBA::Char>;
+template class TAO::Inout_UB_String_Argument_T<CORBA::Char>;
+template class TAO::Out_UB_String_Argument_T<CORBA::Char,
+                                             CORBA::String_out>;
+template class TAO::Ret_UB_String_Argument_T<CORBA::Char,
+                                             CORBA::String_var>;
+template class TAO::In_UB_String_SArgument_T<CORBA::Char,
+                                             CORBA::String_var>;
+template class TAO::Inout_UB_String_SArgument_T<CORBA::Char,
+                                                CORBA::String_var>;
+template class TAO::Out_UB_String_SArgument_T<CORBA::Char,
+                                              CORBA::String_var>;
+template class TAO::Ret_UB_String_SArgument_T<CORBA::Char,
+                                              CORBA::String_var>;
+
+template class TAO::In_UB_String_Argument_T<CORBA::WChar>;
+template class TAO::Inout_UB_String_Argument_T<CORBA::WChar>;
+template class TAO::Out_UB_String_Argument_T<CORBA::WChar,
+                                             CORBA::WString_out>;
+template class TAO::Ret_UB_String_Argument_T<CORBA::WChar,
+                                             CORBA::WString_var>;
+template class TAO::In_UB_String_SArgument_T<CORBA::WChar,
+                                             CORBA::WString_var>;
+template class TAO::Inout_UB_String_SArgument_T<CORBA::WChar,
+                                                CORBA::WString_var>;
+template class TAO::Out_UB_String_SArgument_T<CORBA::WChar,
+                                              CORBA::WString_var>;
+template class TAO::Ret_UB_String_SArgument_T<CORBA::WChar,
+                                              CORBA::WString_var>;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-# pragma instantiate TAO::Arg_Traits<CORBA::String>
-# pragma instantiate TAO::Arg_Traits<CORBA::WString>
+#pragma instantiate TAO::Arg_Traits<CORBA::String>
+#pragma instantiate TAO::Arg_Traits<CORBA::WString>
+
+#pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::Char, \
+                                                CORBA::String_var, \
+                                                CORBA::String_out>
+#pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::WChar, \
+                                                CORBA::WString_var, \
+                                                CORBA::WString_out>
+
+#pragma instantiate TAO::In_UB_String_Argument_T<CORBA::Char>
+#pragma instantiate TAO::Inout_UB_String_Argument_T<CORBA::Char>
+#pragma instantiate TAO::Out_UB_String_Argument_T<CORBA::Char, \
+                                                  CORBA::String_out>
+#pragma instantiate TAO::Ret_UB_String_Argument_T<CORBA::Char, \
+                                                  CORBA::String_var>
+#pragma instantiate TAO::In_UB_String_SArgument_T<CORBA::Char, \
+                                                  CORBA::String_var>
+#pragma instantiate TAO::Inout_UB_String_SArgument_T<CORBA::Char, \
+                                                      CORBA::String_var>
+#pragma instantiate TAO::Out_UB_String_SArgument_T<CORBA::Char, \
+                                                    CORBA::String_var>
+#pragma instantiate TAO::Ret_UB_String_SArgument_T<CORBA::Char, \
+                                                    CORBA::String_var>
 
-# pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::Char, \
-                                                 CORBA::String_var, \
-                                                 CORBA::String_out>
-# pragma instantiate TAO::UB_String_Arg_Traits_T<CORBA::WChar, \
-                                                 CORBA::WString_var, \
-                                                 CORBA::WString_out>
+#pragma instantiate TAO::In_UB_String_Argument_T<CORBA::WChar>
+#pragma instantiate TAO::Inout_UB_String_Argument_T<CORBA::WChar>
+#pragma instantiate TAO::Out_UB_String_Argument_T<CORBA::WChar, \
+                                                  CORBA::WString_out>
+#pragma instantiate TAO::Ret_UB_String_Argument_T<CORBA::WChar, \
+                                                  CORBA::WString_var>
+#pragma instantiate TAO::In_UB_String_SArgument_T<CORBA::WChar, \
+                                                  CORBA::WString_var>
+#pragma instantiate TAO::Inout_UB_String_SArgument_T<CORBA::WChar, \
+                                                     CORBA::WString_var>
+#pragma instantiate TAO::Out_UB_String_SArgument_T<CORBA::WChar, \
+                                                   CORBA::WString_var>
+#pragma instantiate TAO::Ret_UB_String_SArgument_T<CORBA::WChar, \
+                                                   CORBA::WString_var>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index d5e5fad109f..2c6153bb378 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -104,7 +104,7 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
 
 template<typename S_slice, typename S_var, typename S_forany>
 ACE_INLINE
-AO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
 Ret_Var_Array_SArgument_T (void)
 {}