Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1803)

Unified Diff: base/strings/string16.h

Issue 1548993002: Switch to standard integer types in base/strings/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/strings/safe_sprintf_unittest.cc ('k') | base/strings/string_number_conversions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/strings/string16.h
diff --git a/base/strings/string16.h b/base/strings/string16.h
index ba4ffe788a48ec10470c5417a862aa172e9c6f0a..e47669c1b565e7cb79bfc275eb5965a9e506cbdf 100644
--- a/base/strings/string16.h
+++ b/base/strings/string16.h
@@ -26,11 +26,13 @@
// libc functions with custom, 2-byte-char compatible routines. It is capable
// of carrying UTF-16-encoded data.
+#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
#include <string>
#include "base/base_export.h"
-#include "base/basictypes.h"
+#include "build/build_config.h"
#if defined(WCHAR_T_IS_UTF16)
@@ -46,7 +48,7 @@ typedef std::char_traits<wchar_t> string16_char_traits;
namespace base {
-typedef uint16 char16;
+typedef uint16_t char16;
// char16 versions of the functions required by string16_char_traits; these
// are based on the wide character functions of similar names ("w" or "wcs"
« no previous file with comments | « base/strings/safe_sprintf_unittest.cc ('k') | base/strings/string_number_conversions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698