Bug 712939 - Replace JS_STATIC_ASSERT with static_assert outside js/ directory. r=mccr8

2014-02-17 23:56:19 -08:00
parent 56569bb68e
commit 3ef04142ee
3 changed files with 6 additions and 3 deletions
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -549,7 +549,8 @@ CycleCollectedJSRuntime::DescribeGCThing(bool aIsMarked, void* aThing,
      "BaseShape",
      "TypeObject",
    };
-    JS_STATIC_ASSERT(MOZ_ARRAY_LENGTH(trace_types) == JSTRACE_LAST + 1);
+    static_assert(MOZ_ARRAY_LENGTH(trace_types) == JSTRACE_LAST + 1,
+                  "Length of trace_types should match the number of cases of JSGCTraceKind.");
    JS_snprintf(name, sizeof(name), "JS %s", trace_types[aTraceKind]);
  }