13 files changed, 35 insertions, 6 deletions
diff --git a/tao/PortableServer/BD_String_SArgument_T.cpp b/tao/PortableServer/BD_String_SArgument_T.cpp
index c10caac89fc..a69b65eb075 100644
--- a/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -3,7 +3,10 @@
 #ifndef TAO_BD_STRING_SARGUMENT_T_CPP
 #define TAO_BD_STRING_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/BD_String_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/tao/PortableServer/Basic_SArgument_T.cpp b/tao/PortableServer/Basic_SArgument_T.cpp
index 8dfab051a81..7854e33eee0 100644
--- a/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/tao/PortableServer/Basic_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_BASIC_SARGUMENT_T_CPP
 #define TAO_BASIC_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Basic_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Basic_SArgument_T.inl"
diff --git a/tao/PortableServer/Basic_SArgument_T.h b/tao/PortableServer/Basic_SArgument_T.h
index ed235cf0bcd..0d0bd17ec1c 100644
--- a/tao/PortableServer/Basic_SArgument_T.h
+++ b/tao/PortableServer/Basic_SArgument_T.h
@@ -140,7 +140,6 @@ namespace TAO
     typedef inout_type                  inout_arg_type;
     typedef out_type                    out_arg_type;
     typedef out_type                    ret_arg_type;
-
   };
 }
 
diff --git a/tao/PortableServer/Basic_SArguments.h b/tao/PortableServer/Basic_SArguments.h
index 0fca6f3b1ef..45b91ffcf24 100644
--- a/tao/PortableServer/Basic_SArguments.h
+++ b/tao/PortableServer/Basic_SArguments.h
@@ -140,6 +140,16 @@ namespace TAO
         TAO::Any_Insert_Policy_Stream>
   {
   };
+
+#if !defined(ACE_LACKS_STD_WSTRING)
+  template<>
+  class TAO_PortableServer_Export SArg_Traits<std::wstring>
+    : public Basic_SArg_Traits_T<
+        std::wstring,
+        TAO::Any_Insert_Policy_Stream>
+  {
+  };
+#endif
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 5fa5e197343..3767425538c 100644
--- a/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP
 #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Fixed_Array_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
diff --git a/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index 66e53e98988..285d90da9c5 100644
--- a/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP
 #define TAO_FIXED_SIZE_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Fixed_Size_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
diff --git a/tao/PortableServer/Object_SArgument_T.cpp b/tao/PortableServer/Object_SArgument_T.cpp
index 00e5b8948e4..163a0813883 100644
--- a/tao/PortableServer/Object_SArgument_T.cpp
+++ b/tao/PortableServer/Object_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_OBJECT_SARGUMENT_T_CPP
 #define TAO_OBJECT_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Object_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Object_SArgument_T.inl"
diff --git a/tao/PortableServer/Servant_Base.h b/tao/PortableServer/Servant_Base.h
index 65777ee8f75..5b9090eb203 100644
--- a/tao/PortableServer/Servant_Base.h
+++ b/tao/PortableServer/Servant_Base.h
@@ -63,9 +63,9 @@ class TAO_PortableServer_Export TAO_ServantBase
 {
 public:
   /// Useful for template programming.
-  typedef ::CORBA::Object               _stub_type;
-  typedef ::CORBA::Object_ptr           _stub_ptr_type;
-  typedef ::CORBA::Object_var           _stub_var_type;
+  typedef CORBA::Object     _stub_type;
+  typedef CORBA::Object_ptr _stub_ptr_type;
+  typedef CORBA::Object_var _stub_var_type;
 
   /// Destructor.
   virtual ~TAO_ServantBase (void);
diff --git a/tao/PortableServer/Special_Basic_SArgument_T.cpp b/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 2cdb15d8b5b..6fc56c84267 100644
--- a/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
 #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Special_Basic_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Special_Basic_SArgument_T.inl"
diff --git a/tao/PortableServer/UB_String_SArgument_T.cpp b/tao/PortableServer/UB_String_SArgument_T.cpp
index 7f8db0408f5..d66915ae066 100644
--- a/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_UB_STRING_SARGUMENT_T_CPP
 #define TAO_UB_STRING_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/UB_String_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
diff --git a/tao/PortableServer/Var_Array_SArgument_T.cpp b/tao/PortableServer/Var_Array_SArgument_T.cpp
index 0ba7f075cac..70600dbfbbd 100644
--- a/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -3,7 +3,9 @@
 #ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP
 #define TAO_VAR_ARRAY_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Var_Array_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
diff --git a/tao/PortableServer/Var_Size_SArgument_T.cpp b/tao/PortableServer/Var_Size_SArgument_T.cpp
index a0aed6f8d57..eb1e13e4cb3 100644
--- a/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -3,14 +3,16 @@
 #ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP
 #define TAO_VAR_SIZE_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
diff --git a/tao/PortableServer/Vector_SArgument_T.cpp b/tao/PortableServer/Vector_SArgument_T.cpp
index de157b9975b..a55fed0717e 100644
--- a/tao/PortableServer/Vector_SArgument_T.cpp
+++ b/tao/PortableServer/Vector_SArgument_T.cpp
@@ -3,13 +3,14 @@
 #ifndef TAO_VECTOR_SARGUMENT_T_CPP
 #define TAO_VECTOR_SARGUMENT_T_CPP
 
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #include "tao/PortableServer/Vector_SArgument_T.h"
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Vector_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,