back out 3a8893b28489 (bug 712939) and 39adab158c17,16add78c43e3,37193db7e15b (bug 712873), for build bustage.

This commit is contained in:
Daniel Holbert
2014-02-19 00:15:51 -08:00
parent 7e12e52dd2
commit 89c63da190
36 changed files with 261 additions and 265 deletions

View File

@@ -548,8 +548,7 @@ CycleCollectedJSRuntime::DescribeGCThing(bool aIsMarked, void* aThing,
"BaseShape",
"TypeObject",
};
static_assert(MOZ_ARRAY_LENGTH(trace_types) == JSTRACE_LAST + 1,
"Length of trace_types should match the number of cases of JSGCTraceKind.");
JS_STATIC_ASSERT(MOZ_ARRAY_LENGTH(trace_types) == JSTRACE_LAST + 1);
JS_snprintf(name, sizeof(name), "JS %s", trace_types[aTraceKind]);
}