From d1bafad4362a2ef2ca9200728c2e9ca6aa96049f Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Sat, 28 Jan 2012 01:02:17 +0000 Subject: [PATCH] Revert 119540 - Add StringToSizeT to base/string_number_conversions. Compile error in webrequest_api.cc. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9296002 TBR=kalman@chromium.org Review URL: https://chromiumcodereview.appspot.com/9296027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119549 0039d316-1c4b-4281-b951-d872f2087c98 --- base/string_number_conversions.cc | 12 ++++++++++-- base/string_number_conversions.h | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/base/string_number_conversions.cc b/base/string_number_conversions.cc index 40c0145ea61f60..41319b35fd66db 100644 --- a/base/string_number_conversions.cc +++ b/base/string_number_conversions.cc @@ -402,6 +402,14 @@ bool StringToInt(const StringPiece16& input, int* output) { return String16ToIntImpl(input, output); } +bool StringToUint(const StringPiece& input, unsigned* output) { + return StringToIntImpl(input, output); +} + +bool StringToUint(const StringPiece16& input, unsigned* output) { + return String16ToIntImpl(input, output); +} + bool StringToInt64(const StringPiece& input, int64* output) { return StringToIntImpl(input, output); } @@ -410,11 +418,11 @@ bool StringToInt64(const StringPiece16& input, int64* output) { return String16ToIntImpl(input, output); } -bool StringToSizeT(const StringPiece& input, size_t* output) { +bool StringToUint64(const StringPiece& input, uint64* output) { return StringToIntImpl(input, output); } -bool StringToSizeT(const StringPiece16& input, size_t* output) { +bool StringToUint64(const StringPiece16& input, uint64* output) { return String16ToIntImpl(input, output); } diff --git a/base/string_number_conversions.h b/base/string_number_conversions.h index 494b49a93e7288..b002faa341ab57 100644 --- a/base/string_number_conversions.h +++ b/base/string_number_conversions.h @@ -62,11 +62,14 @@ BASE_EXPORT std::string DoubleToString(double value); BASE_EXPORT bool StringToInt(const StringPiece& input, int* output); BASE_EXPORT bool StringToInt(const StringPiece16& input, int* output); +BASE_EXPORT bool StringToUint(const StringPiece& input, unsigned* output); +BASE_EXPORT bool StringToUint(const StringPiece16& input, unsigned* output); + BASE_EXPORT bool StringToInt64(const StringPiece& input, int64* output); BASE_EXPORT bool StringToInt64(const StringPiece16& input, int64* output); -BASE_EXPORT bool StringToSizeT(const StringPiece& input, size_t* output); -BASE_EXPORT bool StringToSizeT(const StringPiece16& input, size_t* output); +BASE_EXPORT bool StringToUint64(const StringPiece& input, uint64* output); +BASE_EXPORT bool StringToUint64(const StringPiece16& input, uint64* output); // For floating-point conversions, only conversions of input strings in decimal // form are defined to work. Behavior with strings representing floating-point