Bug 716553 - fix build warnings in Telemetry.cpp; r=taras

This commit is contained in:
Nathan Froyd 2012-01-09 13:01:52 -05:00
parent a5124bc419
commit 6e8eddafdd

View File

@ -223,7 +223,6 @@ ReflectHistogramSnapshot(JSContext *cx, JSObject *obj, Histogram *h)
h->SnapshotSample(&ss); h->SnapshotSample(&ss);
JSObject *counts_array; JSObject *counts_array;
JSObject *rarray; JSObject *rarray;
jsval static_histogram = h->flags() && Histogram::kUmaTargetedHistogramFlag ? JSVAL_TRUE : JSVAL_FALSE;
const size_t count = h->bucket_count(); const size_t count = h->bucket_count();
if (!(JS_DefineProperty(cx, obj, "min", INT_TO_JSVAL(h->declared_min()), NULL, NULL, JSPROP_ENUMERATE) if (!(JS_DefineProperty(cx, obj, "min", INT_TO_JSVAL(h->declared_min()), NULL, NULL, JSPROP_ENUMERATE)
&& JS_DefineProperty(cx, obj, "max", INT_TO_JSVAL(h->declared_max()), NULL, NULL, JSPROP_ENUMERATE) && JS_DefineProperty(cx, obj, "max", INT_TO_JSVAL(h->declared_max()), NULL, NULL, JSPROP_ENUMERATE)
@ -330,7 +329,7 @@ mHashMutex("Telemetry::mHashMutex")
}; };
mTrackedDBs.Init(); mTrackedDBs.Init();
for (int i = 0; i < sizeof(trackedDBs)/sizeof(const char*); i++) for (size_t i = 0; i < ArrayLength(trackedDBs); i++)
mTrackedDBs.PutEntry(nsDependentCString(trackedDBs[i])); mTrackedDBs.PutEntry(nsDependentCString(trackedDBs[i]));
#ifdef DEBUG #ifdef DEBUG