Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / mojo / public / c / system / tests / macros_unittest.cc

diff --git a/src/mojo/public/c/system/tests/macros_unittest.cc b/src/mojo/public/c/system/tests/macros_unittest.cc
index 6a694b8..b22e124 100644 (file)
--- a/src/mojo/public/c/system/tests/macros_unittest.cc
+++ b/src/mojo/public/c/system/tests/macros_unittest.cc
@@ -21,7 +21,8 @@ namespace {
 
 TEST(MacrosTest, AllowUnused) {
   // Test that no warning/error is issued even though |x| is unused.
-  int x MOJO_ALLOW_UNUSED = 123;
+  int x = 123;
+  MOJO_ALLOW_UNUSED_LOCAL(x);
 }
 
 int MustUseReturnedResult() MOJO_WARN_UNUSED_RESULT;
@@ -34,14 +35,14 @@ TEST(MacrosTest, WarnUnusedResult) {
     abort();
 }
 
-// First test |MOJO_COMPILE_ASSERT()| in a global scope.
-MOJO_COMPILE_ASSERT(sizeof(int64_t) == 2 * sizeof(int32_t),
-                    bad_compile_assert_failure_in_global_scope);
+// First test |MOJO_STATIC_ASSERT()| in a global scope.
+MOJO_STATIC_ASSERT(sizeof(int64_t) == 2 * sizeof(int32_t),
+                   "Bad static_assert() failure in global scope");
 
 TEST(MacrosTest, CompileAssert) {
   // Then in a local scope.
-  MOJO_COMPILE_ASSERT(sizeof(int32_t) == 2 * sizeof(int16_t),
-                      bad_compile_assert_failure);
+  MOJO_STATIC_ASSERT(sizeof(int32_t) == 2 * sizeof(int16_t),
+                     "Bad static_assert() failure");
 }
 
 TEST(MacrosTest, Alignof) {