diff options
Diffstat (limited to 'base/strings/string_number_conversions.h')
| -rw-r--r-- | base/strings/string_number_conversions.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/base/strings/string_number_conversions.h b/base/strings/string_number_conversions.h index ee4c7a56e4..4a50284c87 100644 --- a/base/strings/string_number_conversions.h +++ b/base/strings/string_number_conversions.h @@ -5,11 +5,13 @@ #ifndef BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_ #define BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> #include <vector> #include "base/base_export.h" -#include "base/basictypes.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" @@ -35,11 +37,11 @@ BASE_EXPORT string16 IntToString16(int value); BASE_EXPORT std::string UintToString(unsigned value); BASE_EXPORT string16 UintToString16(unsigned value); -BASE_EXPORT std::string Int64ToString(int64 value); -BASE_EXPORT string16 Int64ToString16(int64 value); +BASE_EXPORT std::string Int64ToString(int64_t value); +BASE_EXPORT string16 Int64ToString16(int64_t value); -BASE_EXPORT std::string Uint64ToString(uint64 value); -BASE_EXPORT string16 Uint64ToString16(uint64 value); +BASE_EXPORT std::string Uint64ToString(uint64_t value); +BASE_EXPORT string16 Uint64ToString16(uint64_t value); BASE_EXPORT std::string SizeTToString(size_t value); BASE_EXPORT string16 SizeTToString16(size_t value); @@ -65,17 +67,19 @@ BASE_EXPORT std::string DoubleToString(double value); // - No characters parseable as a number at the beginning of the string. // |*output| will be set to 0. // - Empty string. |*output| will be set to 0. +// WARNING: Will write to |output| even when returning false. +// Read the comments above carefully. 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 StringToInt64(const StringPiece& input, int64_t* output); +BASE_EXPORT bool StringToInt64(const StringPiece16& input, int64_t* output); -BASE_EXPORT bool StringToUint64(const StringPiece& input, uint64* output); -BASE_EXPORT bool StringToUint64(const StringPiece16& input, uint64* output); +BASE_EXPORT bool StringToUint64(const StringPiece& input, uint64_t* output); +BASE_EXPORT bool StringToUint64(const StringPiece16& input, uint64_t* output); BASE_EXPORT bool StringToSizeT(const StringPiece& input, size_t* output); BASE_EXPORT bool StringToSizeT(const StringPiece16& input, size_t* output); @@ -83,10 +87,12 @@ BASE_EXPORT bool StringToSizeT(const StringPiece16& input, size_t* output); // Deprecated: prefer std::stod() instead. // For floating-point conversions, only conversions of input strings in decimal // form are defined to work. Behavior with strings representing floating-point -// numbers in hexadecimal, and strings representing non-fininte values (such as +// numbers in hexadecimal, and strings representing non-finite values (such as // NaN and inf) is undefined. Otherwise, these behave the same as the integral // variants. This expects the input string to NOT be specific to the locale. // If your input is locale specific, use ICU to read the number. +// WARNING: Will write to |output| even when returning false. +// Read the comments here and above StringToInt() carefully. BASE_EXPORT bool StringToDouble(const std::string& input, double* output); // Hex encoding ---------------------------------------------------------------- @@ -108,25 +114,25 @@ BASE_EXPORT bool HexStringToInt(const StringPiece& input, int* output); // Will only successful parse hex values that will fit into |output|, i.e. // 0x00000000 < |input| < 0xFFFFFFFF. // The string is not required to start with 0x. -BASE_EXPORT bool HexStringToUInt(const StringPiece& input, uint32* output); +BASE_EXPORT bool HexStringToUInt(const StringPiece& input, uint32_t* output); // Best effort conversion, see StringToInt above for restrictions. // Will only successful parse hex values that will fit into |output|, i.e. // -0x8000000000000000 < |input| < 0x7FFFFFFFFFFFFFFF. -BASE_EXPORT bool HexStringToInt64(const StringPiece& input, int64* output); +BASE_EXPORT bool HexStringToInt64(const StringPiece& input, int64_t* output); // Best effort conversion, see StringToInt above for restrictions. // Will only successful parse hex values that will fit into |output|, i.e. // 0x0000000000000000 < |input| < 0xFFFFFFFFFFFFFFFF. // The string is not required to start with 0x. -BASE_EXPORT bool HexStringToUInt64(const StringPiece& input, uint64* output); +BASE_EXPORT bool HexStringToUInt64(const StringPiece& input, uint64_t* output); // Similar to the previous functions, except that output is a vector of bytes. // |*output| will contain as many bytes as were successfully parsed prior to the // error. There is no overflow, but input.size() must be evenly divisible by 2. // Leading 0x or +/- are not allowed. BASE_EXPORT bool HexStringToBytes(const std::string& input, - std::vector<uint8>* output); + std::vector<uint8_t>* output); } // namespace base |