diff options
author | avi <avi@chromium.org> | 2015-12-26 09:24:22 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 17:25:06 +0000 |
commit | 0d65fb8a06f3ab6e5c309e378e12640a2906af66 (patch) | |
tree | 0f17edd6ef77d01f297da74b8091da29db0552d7 | |
parent | d46e6212cf8ad49f1ddb028b661fa27d73aeb774 (diff) | |
download | chromium_src-0d65fb8a06f3ab6e5c309e378e12640a2906af66.zip chromium_src-0d65fb8a06f3ab6e5c309e378e12640a2906af66.tar.gz chromium_src-0d65fb8a06f3ab6e5c309e378e12640a2906af66.tar.bz2 |
Switch to standard integer types in third_party/mojo/.
BUG=138542
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/1547163002
Cr-Commit-Position: refs/heads/master@{#366902}
-rw-r--r-- | third_party/mojo/src/mojo/edk/js/handle.h | 2 | ||||
-rw-r--r-- | third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/third_party/mojo/src/mojo/edk/js/handle.h b/third_party/mojo/src/mojo/edk/js/handle.h index 00f258f..9c10466 100644 --- a/third_party/mojo/src/mojo/edk/js/handle.h +++ b/third_party/mojo/src/mojo/edk/js/handle.h @@ -48,7 +48,7 @@ class HandleWrapper : public gin::Wrappable<HandleWrapper> { namespace gin { // Note: It's important to use this converter rather than the one for -// MojoHandle, since that will do a simple int32 conversion. It's unfortunate +// MojoHandle, since that will do a simple int32_t conversion. It's unfortunate // there's no way to prevent against accidental use. // TODO(mpcomplete): define converters for all Handle subtypes. template<> diff --git a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc index a1da809..2c213fe 100644 --- a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc +++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc @@ -24,23 +24,23 @@ namespace js { // Global value updated by some checks to prevent compilers from optimizing // reads out of existence. -uint32 g_waste_accumulator = 0; +uint32_t g_waste_accumulator = 0; namespace { // Negative numbers with different values in each byte, the last of // which can survive promotion to double and back. -const int8 kExpectedInt8Value = -65; -const int16 kExpectedInt16Value = -16961; -const int32 kExpectedInt32Value = -1145258561; -const int64 kExpectedInt64Value = -77263311946305LL; +const int8_t kExpectedInt8Value = -65; +const int16_t kExpectedInt16Value = -16961; +const int32_t kExpectedInt32Value = -1145258561; +const int64_t kExpectedInt64Value = -77263311946305LL; // Positive numbers with different values in each byte, the last of // which can survive promotion to double and back. -const uint8 kExpectedUInt8Value = 65; -const uint16 kExpectedUInt16Value = 16961; -const uint32 kExpectedUInt32Value = 1145258561; -const uint64 kExpectedUInt64Value = 77263311946305LL; +const uint8_t kExpectedUInt8Value = 65; +const uint16_t kExpectedUInt16Value = 16961; +const uint32_t kExpectedUInt32Value = 1145258561; +const uint64_t kExpectedUInt64Value = 77263311946305LL; // Double/float values, including special case constants. const double kExpectedDoubleVal = 3.14159265358979323846; |