| 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();
|
|
|