summaryrefslogtreecommitdiff
path: root/ace/OS_String.cpp
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-24 05:12:06 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-04-24 05:12:06 +0000
commit0756bceb855477f313f1eaca5d01f9e36bb3e36d (patch)
tree4a0e8ef5428d6e4478da2a46b566c84df67ef376 /ace/OS_String.cpp
parentad7f2d4ae4273710073d841fe5afccaf14e6718a (diff)
downloadATCD-fix_bug132_iter04_fin.tar.gz
This commit was manufactured by cvs2svn to create tagfix_bug132_iter04_fin
'fix_bug132_iter04_fin'.
Diffstat (limited to 'ace/OS_String.cpp')
-rw-r--r--ace/OS_String.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
index 6bc7aaf44f5..6db181f53fe 100644
--- a/ace/OS_String.cpp
+++ b/ace/OS_String.cpp
@@ -99,17 +99,13 @@ ACE_OS_String::strdup (const wchar_t *s)
# elif defined (ACE_WCSDUP_EQUIVALENT)
return ACE_WCSDUP_EQUIVALENT (s);
# else /* ACE_LACKS_WCSDUP */
-# if defined (__MINGW32__)
- return ::wcsdup (ACE_const_cast(wchar_t*, s));
-# else /* __MINGW32__ */
return ::wcsdup (s);
-# endif /* __MINGW32__ */
# endif /* ACE_LACKS_WCSDUP */
}
#endif /* ACE_HAS_WCHAR */
#if defined (ACE_LACKS_STRERROR)
-/**
+/**
* Just returns "Unknown Error" all the time.
*/
char *
@@ -851,7 +847,7 @@ ACE_OS_String::wcsncmp_emulation (const wchar_t *s1,
#endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSNCMP */
#if defined (ACE_LACKS_STRTOL)
-long
+long
ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base)
{
register const char *s = nptr;
@@ -859,7 +855,7 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base)
register int c;
register unsigned long cutoff;
register int neg = 0, any, cutlim;
-
+
/*
* Skip white space and pick up leading +/- sign if any.
* If base is 0, allow 0x for hex and 0 for octal, else
@@ -881,7 +877,7 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base)
}
if (base == 0)
base = c == '0' ? 8 : 10;
-
+
/*
* Compute the cutoff value between legal numbers and illegal
* numbers. That is the largest legal value, divided by the
@@ -932,8 +928,8 @@ ACE_OS_String::strtol_emulation (const char *nptr, char **endptr, int base)
#if defined (ACE_LACKS_STRTOUL)
unsigned long
-ACE_OS_String::strtoul_emulation (const char *nptr,
- char **endptr,
+ACE_OS_String::strtoul_emulation (const char *nptr,
+ char **endptr,
register int base)
{
register const char *s = nptr;
@@ -941,7 +937,7 @@ ACE_OS_String::strtoul_emulation (const char *nptr,
register int c;
register unsigned long cutoff;
register int neg = 0, any, cutlim;
-
+
/*
* See strtol for comments as to the logic used.
*/