ChangeLogTag: Fri Jul 20 15:53:56 2001 Joe Hoffert <joeh@cs.wustl.edu>

2 files changed, 11 insertions, 2 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 6fad6ac23e2..67b9f20ca36 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 20 15:53:56 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * pace/win32/string.c (strtok_r):
+          Fixed problems with reference to ACE_OS and some C++
+          incongruities.
+
 Fri Jul 20 15:44:02 2001  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * pace/win32/string.h: 
diff --git a/PACE/pace/win32/string.c b/PACE/pace/win32/string.c
index 1a1ae055728..f7f79cc7fab 100644
--- a/PACE/pace/win32/string.c
+++ b/PACE/pace/win32/string.c
@@ -23,14 +23,17 @@
 char *
 strtok_r (char * s, const char * sep, char ** lasts)
 {
+  int l_org;
+  int l_sub;
+
   if (s == 0)
     s = *lasts;
   else
     *lasts = s;
   if (*s == 0)                  // We have reached the end
     return 0;
-  int l_org = ACE_OS_String::strlen (s);
-  int l_sub = ACE_OS_String::strlen (s = ::strtok (s, sep));
+  l_org = pace_strlen (s);
+  l_sub = pace_strlen (s = pace_strtok (s, sep));
   *lasts = s + l_sub;
   if (l_sub != l_org)
     *lasts += 1;