Index: base/strings/string_util.h |
diff --git a/base/strings/string_util.h b/base/strings/string_util.h |
index 6f3b766fc13873b884fbf773a4859a6cd7dbe341..f372d45cc41af477415363bcc15015d55e7d8030 100644 |
--- a/base/strings/string_util.h |
+++ b/base/strings/string_util.h |
@@ -377,16 +377,6 @@ BASE_EXPORT bool EndsWith(const string16& str, |
const string16& search, |
bool case_sensitive); |
-} // namespace base |
- |
-#if defined(OS_WIN) |
-#include "base/strings/string_util_win.h" |
-#elif defined(OS_POSIX) |
-#include "base/strings/string_util_posix.h" |
-#else |
-#error Define string operations appropriately for your platform |
-#endif |
- |
// Determines the type of ASCII character, independent of locale (the C |
// library versions will change based on locale). |
template <typename Char> |
@@ -409,20 +399,15 @@ inline bool IsHexDigit(Char c) { |
(c >= 'a' && c <= 'f'); |
} |
-template <typename Char> |
-inline char HexDigitToInt(Char c) { |
- DCHECK(IsHexDigit(c)); |
- if (c >= '0' && c <= '9') |
- return static_cast<char>(c - '0'); |
- if (c >= 'A' && c <= 'F') |
- return static_cast<char>(c - 'A' + 10); |
- if (c >= 'a' && c <= 'f') |
- return static_cast<char>(c - 'a' + 10); |
- return 0; |
-} |
+// Returns the integer corresponding to the given hex character. For example: |
+// '4' -> 4 |
+// 'a' -> 10 |
+// 'B' -> 11 |
+// Assumes the input is a valid hex character. DCHECKs in debug builds if not. |
+BASE_EXPORT char HexDigitToInt(wchar_t c); |
-// Returns true if it's a whitespace character. |
-inline bool IsWhitespace(wchar_t c) { |
+// Returns true if it's a Unicode whitespace character. |
+inline bool IsUnicodeWhitespace(wchar_t c) { |
return wcschr(base::kWhitespaceWide, c) != NULL; |
} |
@@ -430,7 +415,17 @@ inline bool IsWhitespace(wchar_t c) { |
// appropriate for use in any UI; use of FormatBytes and friends in ui/base is |
// highly recommended instead. TODO(avi): Figure out how to get callers to use |
// FormatBytes instead; remove this. |
-BASE_EXPORT base::string16 FormatBytesUnlocalized(int64 bytes); |
+BASE_EXPORT string16 FormatBytesUnlocalized(int64 bytes); |
+ |
+} // namespace base |
+ |
+#if defined(OS_WIN) |
+#include "base/strings/string_util_win.h" |
+#elif defined(OS_POSIX) |
+#include "base/strings/string_util_posix.h" |
+#else |
+#error Define string operations appropriately for your platform |
+#endif |
// Starting at |start_offset| (usually 0), replace the first instance of |
// |find_this| with |replace_with|. |