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

Unified Diff: base/i18n/icu_util.cc

Issue 1542323002: Switch to standard integer types in base/i18n/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: header 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/i18n/icu_util.h ('k') | base/i18n/message_formatter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/icu_util.cc
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index e3afc049b335ca12863b9310405f274d012dace0..d7e45c3400d3419501f6feb70c6e7cae9e560ba4 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -17,6 +17,7 @@
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
+#include "build/build_config.h"
#include "third_party/icu/source/common/unicode/putil.h"
#include "third_party/icu/source/common/unicode/udata.h"
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -155,7 +156,7 @@ bool InitializeICUWithFileDescriptorInternal(
g_icudtl_mapped_file = icudtl_mapped_file.release();
UErrorCode err = U_ZERO_ERROR;
- udata_setCommonData(const_cast<uint8*>(g_icudtl_mapped_file->data()), &err);
+ udata_setCommonData(const_cast<uint8_t*>(g_icudtl_mapped_file->data()), &err);
return err == U_ZERO_ERROR;
}
#endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
@@ -183,12 +184,12 @@ PlatformFile GetIcuDataFileHandle(MemoryMappedFile::Region* out_region) {
}
#endif
-const uint8* GetRawIcuMemory() {
+const uint8_t* GetRawIcuMemory() {
CHECK(g_icudtl_mapped_file);
return g_icudtl_mapped_file->data();
}
-bool InitializeICUFromRawMemory(const uint8* raw_memory) {
+bool InitializeICUFromRawMemory(const uint8_t* raw_memory) {
#if !defined(COMPONENT_BUILD)
#if !defined(NDEBUG)
DCHECK(!g_check_called_once || !g_called_once);
@@ -196,7 +197,7 @@ bool InitializeICUFromRawMemory(const uint8* raw_memory) {
#endif
UErrorCode err = U_ZERO_ERROR;
- udata_setCommonData(const_cast<uint8*>(raw_memory), &err);
+ udata_setCommonData(const_cast<uint8_t*>(raw_memory), &err);
return err == U_ZERO_ERROR;
#else
return true;
« no previous file with comments | « base/i18n/icu_util.h ('k') | base/i18n/message_formatter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698