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

Unified Diff: base/strings/sys_string_conversions_win.cc

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/sys_string_conversions_unittest.cc ('k') | base/strings/utf_offset_string_conversions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/strings/sys_string_conversions_win.cc
diff --git a/base/strings/sys_string_conversions_win.cc b/base/strings/sys_string_conversions_win.cc
index 94d4466223698d1097a032f08736e3d3496e2b15..b70854421df9f0d9112b00f1c65bf96d6654e70c 100644
--- a/base/strings/sys_string_conversions_win.cc
+++ b/base/strings/sys_string_conversions_win.cc
@@ -5,6 +5,7 @@
#include "base/strings/sys_string_conversions.h"
#include <windows.h>
+#include <stdint.h>
#include "base/strings/string_piece.h"
@@ -29,7 +30,7 @@ std::wstring SysNativeMBToWide(const StringPiece& native_mb) {
}
// Do not assert in this function since it is used by the asssertion code!
-std::wstring SysMultiByteToWide(const StringPiece& mb, uint32 code_page) {
+std::wstring SysMultiByteToWide(const StringPiece& mb, uint32_t code_page) {
if (mb.empty())
return std::wstring();
@@ -48,7 +49,7 @@ std::wstring SysMultiByteToWide(const StringPiece& mb, uint32 code_page) {
}
// Do not assert in this function since it is used by the asssertion code!
-std::string SysWideToMultiByte(const std::wstring& wide, uint32 code_page) {
+std::string SysWideToMultiByte(const std::wstring& wide, uint32_t code_page) {
int wide_length = static_cast<int>(wide.length());
if (wide_length == 0)
return std::string();
« no previous file with comments | « base/strings/sys_string_conversions_unittest.cc ('k') | base/strings/utf_offset_string_conversions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698