summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil/InputUtil.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/IceUtil/InputUtil.h')
-rw-r--r--cpp/include/IceUtil/InputUtil.h27
1 files changed, 5 insertions, 22 deletions
diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h
index 7a650ef0ae9..32c888a95d9 100644
--- a/cpp/include/IceUtil/InputUtil.h
+++ b/cpp/include/IceUtil/InputUtil.h
@@ -12,24 +12,22 @@
#include <IceUtil/Config.h>
#include <string>
-#include <limits.h>
namespace IceUtil
{
//
-// strToInt64() is drop-in replacement for UNIX strtoll()
+// Portable strtoll/_strtoi64
//
ICE_UTIL_API Int64 strToInt64(const char*, char**, int);
//
// stringToInt64 converts a string into a signed 64-bit integer.
-//
-// bool stringToInt64(const std::string& stringToParse, Int64& result, std::string::size_type& pos);
+// It's a simple wrapper around strToInt64.
//
// Semantics:
//
-// - Ignore leading and trailing whitespace
+// - Ignore leading whitespace
//
// - If the string starts with '0', parse as octal
//
@@ -38,26 +36,11 @@ ICE_UTIL_API Int64 strToInt64(const char*, char**, int);
// - Otherwise, parse as decimal
//
// - return value == true indicates a successful conversion and result contains the converted value
-//
-// - if pos == string::npos, there are no trailing non-whitespace characters following the converted string
-//
-// - if pos != string::npos, there are trailing non-whitespace characters following the converted string;
-// pos indicates the first such character
-//
// - return value == false indicates an unsuccessful conversion:
-//
// - result == 0 indicates that no digits were available for conversion
+// - result < 0 or result > 0 indicate underflow or overflow.
//
-// - result == INT64MIN or result == INT64MAX indicate underflow or overflow.
-//
-// - if pos == string::npos, the string did not contain trailing non-whitespace characters
-//
-// - if pos != string::npos, the string contained trailing non-whitespace characters following the
-// digits and pos indicates the first such character. (Note that all digits up to the first
-// non-digit, non-whitespace character are consumed, regardless of how far into the digit string
-// an overflow is detected.)
-//
-ICE_UTIL_API bool stringToInt64(const std::string&, Int64&, std::string::size_type&);
+ICE_UTIL_API bool stringToInt64(const std::string&, Int64&);
}