Dave's wide char fixes

2 files changed, 10 insertions, 9 deletions

diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
index 33be6327440..3d41e8880b4 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -331,32 +331,33 @@ private:
 #if !defined (ACE_LACKS_DEPRECATED_MACROS)
 namespace ACE_OS
 {
-  template <> inline size_t
-  strlen( const TAO_String_Manager& str )
+  inline size_t
+  strlen (const TAO_String_Manager& str)
   {
     return ACE_OS::strlen( str.in() );
   }
-  template <> inline int
+  inline int
   strcmp( const TAO_String_Manager& lhs, const char* rhs )
   {
     return ACE_OS::strcmp( lhs.in(), rhs );
   }
-  template <> inline int
+  inline int
   strcmp( const TAO_String_Manager& lhs, const TAO_String_Manager& rhs )
   {
     return ACE_OS::strcmp( lhs.in(), rhs.in() );
   }
-  template <> inline size_t
+
+  inline size_t
   strlen( const TAO_WString_Manager& str )
   {
     return ACE_OS::strlen( str.in() );
   }
-  template <> inline int
-  strcmp( const TAO_WString_Manager& lhs, const char* rhs )
+  inline int
+  strcmp( const TAO_WString_Manager& lhs, const CORBA::WChar* rhs )
   {
     return ACE_OS::strcmp( lhs.in(), rhs );
   }
-  template <> inline int
+  inline int
   strcmp( const TAO_WString_Manager& lhs, const TAO_WString_Manager& rhs )
   {
     return ACE_OS::strcmp( lhs.in(), rhs.in() );
diff --git a/ace/OS_NS_string_base.h b/ace/OS_NS_string_base.h
index 8b696b6903b..76360ca7719 100644
--- a/ace/OS_NS_string_base.h
+++ b/ace/OS_NS_string_base.h
@@ -17,7 +17,7 @@ namespace ACE_OS
 template <typename CHAR> inline
 size_t strlen (const CHAR* s);
 
-/// Finds the length of a string (emulated version).
+/// Finds the length of a string (char version).
 template <> inline
 size_t strlen (const char* s);