Merge mozilla-central to tracemonkey.

2010-07-20 15:07:03 -07:00
parent 39ec1b9bf2 2c1c8d74aa
commit 4c928f80cc
1753 changed files with 106286 additions and 36260 deletions
--- a/js/ipc/ObjectWrapperParent.cpp
+++ b/js/ipc/ObjectWrapperParent.cpp
@@ -41,6 +41,7 @@
 #include "mozilla/jsipc/ObjectWrapperParent.h"
 #include "mozilla/jsipc/ContextWrapperParent.h"
 #include "mozilla/jsipc/CPOWTypes.h"
+#include "mozilla/unused.h"

 #include "jsobj.h"
 #include "jsfun.h"
@@ -640,7 +641,7 @@ ObjectWrapperParent::CPOW_Finalize(JSContext* cx, JSObject* obj)
    ObjectWrapperParent* self = Unwrap(cx, obj);
    if (self) {
        self->mObj = NULL;
-        ObjectWrapperParent::Send__delete__(self);
+        unused << ObjectWrapperParent::Send__delete__(self);
    }
 }