*** empty log message ***

5 files changed, 35 insertions, 25 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 2a9eba34017..838439d66bd 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,13 @@
+Tue May 19 10:05:07 1998  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/SString.cpp (strlen): Renamed ACE_WString::wstrlen to
+ 	  ACE_WString::strlen.
+
+	* ace/SString.i: Reordered functions to make g++ happy.
+
+	* ace/ACE.cpp (hash_pjw): Changed ACE_OS::strlen to
+ 	  ACE_WString::strlen.
+
 Tue May 19 09:52:08 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* ace/config-irix6.x-g++.h: 
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 9849395f268..36aa07bad47 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -366,7 +366,7 @@ ACE::hash_pjw (const ACE_USHORT16 *str, size_t len)
 u_long
 ACE::hash_pjw (const ACE_USHORT16 *str)
 {
-  return ACE::hash_pjw (str, ACE_OS::strlen (str));  
+  return ACE::hash_pjw (str, ACE_WString::strlen (str));  
 }
 
 // The CRC routine was taken from the FreeBSD implementation of cksum,
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 4633ced672e..0afe3565cc1 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -241,7 +241,7 @@ ACE_CString::ACE_CString (const ACE_USHORT16 *s,
     {
       this->release_ = 1;
 
-      this->len_ = ACE_WString::wstrlen (s);      
+      this->len_ = ACE_WString::strlen (s);      
       this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1);
 
       // Copy the ACE_USHORT16 * string byte-by-byte into the char *
@@ -561,9 +561,9 @@ ACE_WString::ACE_WString (ACE_Allocator *alloc)
 
 /* static */
 size_t
-ACE_WString::wstrlen (const ACE_USHORT16 *s)
+ACE_WString::strlen (const ACE_USHORT16 *s)
 {
-  ACE_TRACE ("ACE_WString::wstrlen");
+  ACE_TRACE ("ACE_WString::strlen");
   int i;
 
   for (i = 0; s[i] != 0; i++)
@@ -647,7 +647,7 @@ ACE_WString::ACE_WString (const ACE_USHORT16 *s,
     }
   else
     {
-      this->len_ = this->wstrlen (s);
+      this->len_ = ACE_WString::strlen (s);
       this->rep_ = (ACE_USHORT16 *) this->allocator_->malloc ((this->len_ + 1) * sizeof (ACE_USHORT16));
 
       ACE_OS::memcpy (this->rep_,
@@ -761,7 +761,7 @@ ACE_WString::operator= (const ACE_WString &s)
 void
 ACE_WString::set (const ACE_USHORT16 *s)
 {
-  this->set (s, ACE_WString::wstrlen (s));
+  this->set (s, ACE_WString::strlen (s));
 }
 
 void
@@ -861,8 +861,8 @@ ACE_WString::strstr (const ACE_USHORT16 *s1, const ACE_USHORT16 *s2)
 {
   ACE_TRACE ("ACE_WString::strstr");
 
-  size_t len1 = ACE_WString::wstrlen (s1);
-  size_t len2 = ACE_WString::wstrlen (s2);
+  size_t len1 = ACE_WString::strlen (s1);
+  size_t len2 = ACE_WString::strlen (s2);
 
   size_t len = len1 - len2;
 
diff --git a/ace/SString.h b/ace/SString.h
index 72f1d2fa8ba..ed12cbd4c73 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -431,7 +431,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  static size_t wstrlen (const ACE_USHORT16 *);
+  static size_t strlen (const ACE_USHORT16 *);
   // Computes the length of a "0" terminated ACE_USHORT16 *.
   
   static const ACE_USHORT16 *strstr (const ACE_USHORT16 *s1, const ACE_USHORT16 *s2);
diff --git a/ace/SString.i b/ace/SString.i
index 894e489edb2..c53b5da9682 100644
--- a/ace/SString.i
+++ b/ace/SString.i
@@ -3,22 +3,6 @@
 
 #include "ace/Malloc.h"
 
-ACE_INLINE ACE_WString
-operator+ (const ACE_WString &s, const ACE_WString &t)
-{
-  ACE_WString temp (s);
-  temp += t;
-  return temp;
-}
-
-ACE_INLINE ACE_CString
-operator+ (const ACE_CString &s, const ACE_CString &t)
-{
-  ACE_CString temp (s);
-  temp += t;
-  return temp;
-}
-
 // Default constructor.
 
 ACE_INLINE 
@@ -280,6 +264,22 @@ ACE_CString::hash (void) const
   return ACE::hash_pjw (this->rep_, this->len_);
 }
 
+ACE_INLINE ACE_WString
+operator+ (const ACE_WString &s, const ACE_WString &t)
+{
+  ACE_WString temp (s);
+  temp += t;
+  return temp;
+}
+
+ACE_INLINE ACE_CString
+operator+ (const ACE_CString &s, const ACE_CString &t)
+{
+  ACE_CString temp (s);
+  temp += t;
+  return temp;
+}
+
 ACE_INLINE
 ACE_SString::~ACE_SString (void)
 {