Backout d4cd6c8c9ced (bug 1194985) for gtest orange
authorNathan Froyd <froydnj@mozilla.com>
Mon, 17 Aug 2015 03:58:44 -0400
changeset 257976 a30421f03bc51317050c3970e5120ee063532436
parent 257975 e44c94a159dbf8d50b52a4e2d099498e64576c8b
child 257977 13b813170d8e2cf550518b0be8306d8db1ca62e5
push id29238
push userryanvm@gmail.com
push dateMon, 17 Aug 2015 13:06:57 +0000
treeherdermozilla-central@a6eeb28458fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1194985
milestone43.0a1
backs outd4cd6c8c9cede1363f08bf7bea4d3b902e5e5b3c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout d4cd6c8c9ced (bug 1194985) for gtest orange
toolkit/devtools/server/tests/gtest/DeserializedNodeUbiNodes.cpp
--- a/toolkit/devtools/server/tests/gtest/DeserializedNodeUbiNodes.cpp
+++ b/toolkit/devtools/server/tests/gtest/DeserializedNodeUbiNodes.cpp
@@ -34,18 +34,18 @@ size_t fakeMallocSizeOf(const void*) {
   MOZ_ASSERT_UNREACHABLE("fakeMallocSizeOf should never be called because "
                          "DeserializedNodes report the deserialized size.");
   return 0;
 }
 
 DEF_TEST(DeserializedNodeUbiNodes, {
     const char16_t* typeName = MOZ_UTF16("TestTypeName");
 
-    NodeId id = uint64_t(1) << 33;
-    uint64_t size = uint64_t(1) << 60;
+    NodeId id = 1L << 33;
+    uint64_t size = 1L << 60;
     MockDeserializedNode mocked(id, typeName, size);
 
     DeserializedNode& deserialized = mocked;
     JS::ubi::Node ubi(&deserialized);
 
     // Test the ubi::Node accessors.
 
     EXPECT_EQ(size, ubi.size(fakeMallocSizeOf));