Merge MC -> JM

2011-11-18 18:02:40 -08:00
parent 0a321d8b6f bb36581059
commit de6355b9f3
1351 changed files with 15849 additions and 6020 deletions
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -118,6 +118,7 @@ Statistics::makeTable(ColumnInfo *cols)

 Statistics::Statistics(JSRuntime *rt)
  : runtime(rt)
+  , triggerReason(PUBLIC_API) //dummy reason to satisfy makeTable
 {
    char *env = getenv("MOZ_GCTIMER");
    if (!env || strcmp(env, "none") == 0) {