Index: base/strings/utf_string_conversion_utils.h |
diff --git a/base/strings/utf_string_conversion_utils.h b/base/strings/utf_string_conversion_utils.h |
index a1b2e64a18220cccc4cfe0802f64a47549e9e977..c7164045390eba667ab26fbc7af6216dfd68a2fd 100644 |
--- a/base/strings/utf_string_conversion_utils.h |
+++ b/base/strings/utf_string_conversion_utils.h |
@@ -7,12 +7,15 @@ |
// This should only be used by the various UTF string conversion files. |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include "base/base_export.h" |
#include "base/strings/string16.h" |
namespace base { |
-inline bool IsValidCodepoint(uint32 code_point) { |
+inline bool IsValidCodepoint(uint32_t code_point) { |
// Excludes the surrogate code points ([0xD800, 0xDFFF]) and |
// codepoints larger than 0x10FFFF (the highest codepoint allowed). |
// Non-characters and unassigned codepoints are allowed. |
@@ -20,7 +23,7 @@ inline bool IsValidCodepoint(uint32 code_point) { |
(code_point >= 0xE000u && code_point <= 0x10FFFFu); |
} |
-inline bool IsValidCharacter(uint32 code_point) { |
+inline bool IsValidCharacter(uint32_t code_point) { |
// Excludes non-characters (U+FDD0..U+FDEF, and all codepoints ending in |
// 0xFFFE or 0xFFFF) from the set of valid code points. |
return code_point < 0xD800u || (code_point >= 0xE000u && |
@@ -38,39 +41,39 @@ inline bool IsValidCharacter(uint32 code_point) { |
// |
// Returns true on success. On false, |*code_point| will be invalid. |
BASE_EXPORT bool ReadUnicodeCharacter(const char* src, |
- int32 src_len, |
- int32* char_index, |
- uint32* code_point_out); |
+ int32_t src_len, |
+ int32_t* char_index, |
+ uint32_t* code_point_out); |
// Reads a UTF-16 character. The usage is the same as the 8-bit version above. |
BASE_EXPORT bool ReadUnicodeCharacter(const char16* src, |
- int32 src_len, |
- int32* char_index, |
- uint32* code_point); |
+ int32_t src_len, |
+ int32_t* char_index, |
+ uint32_t* code_point); |
#if defined(WCHAR_T_IS_UTF32) |
// Reads UTF-32 character. The usage is the same as the 8-bit version above. |
BASE_EXPORT bool ReadUnicodeCharacter(const wchar_t* src, |
- int32 src_len, |
- int32* char_index, |
- uint32* code_point); |
+ int32_t src_len, |
+ int32_t* char_index, |
+ uint32_t* code_point); |
#endif // defined(WCHAR_T_IS_UTF32) |
// WriteUnicodeCharacter ------------------------------------------------------- |
// Appends a UTF-8 character to the given 8-bit string. Returns the number of |
// bytes written. |
-BASE_EXPORT size_t WriteUnicodeCharacter(uint32 code_point, |
+BASE_EXPORT size_t WriteUnicodeCharacter(uint32_t code_point, |
std::string* output); |
// Appends the given code point as a UTF-16 character to the given 16-bit |
// string. Returns the number of 16-bit values written. |
-BASE_EXPORT size_t WriteUnicodeCharacter(uint32 code_point, string16* output); |
+BASE_EXPORT size_t WriteUnicodeCharacter(uint32_t code_point, string16* output); |
#if defined(WCHAR_T_IS_UTF32) |
// Appends the given UTF-32 character to the given 32-bit string. Returns the |
// number of 32-bit values written. |
-inline size_t WriteUnicodeCharacter(uint32 code_point, std::wstring* output) { |
+inline size_t WriteUnicodeCharacter(uint32_t code_point, std::wstring* output) { |
// This is the easy case, just append the character. |
output->push_back(code_point); |
return 1; |