1 files changed, 10 insertions, 5 deletions
diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h
index 5276a3e0ba6..e9686f535e3 100644
--- a/TAO/tao/Basic_Types.h
+++ b/TAO/tao/Basic_Types.h
@@ -25,6 +25,12 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+namespace TAO
+{
+  template <typename charT> class String_var;
+  template <typename charT> class String_out;
+}
+
 namespace CORBA
 {
   /**
@@ -73,11 +79,10 @@ namespace CORBA
   typedef WChar &WChar_out;
   //@}
 
-  class String_var;
-  class String_out;
-
-  class WString_var;
-  class WString_out;
+  typedef TAO::String_var<CORBA::Char> String_var;
+  typedef TAO::String_out<CORBA::Char> String_out;
+  typedef TAO::String_var<CORBA::WChar> WString_var;
+  typedef TAO::String_out<CORBA::WChar> WString_out;
 
   class TypeCode;
   typedef TypeCode *TypeCode_ptr;