Bug 801346 - Remove s_VOID_id from dombindings.cpp; r=bholley
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 15 Oct 2012 09:05:09 -0400
changeset 110404 01d9b64351f4b5820c682bd6e79a5bda14e80ed2
parent 110403 faa749453ea4da994daf9bd3630bb3d229c4d691
child 110405 a53a74e310ae6d3e5e189a37b59521f08dda0a9f
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersbholley
bugs801346
milestone19.0a1
Bug 801346 - Remove s_VOID_id from dombindings.cpp; r=bholley
js/xpconnect/src/dombindings.cpp
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -33,18 +33,16 @@ enum {
 };
 
 static jsid s_prototype_id = JSID_VOID;
 
 static jsid s_length_id = JSID_VOID;
 
 static jsid s_iterator_id = JSID_VOID;
 
-static jsid s_VOID_id = JSID_VOID;
-
 bool
 DefineStaticJSVal(JSContext *cx, jsid &id, const char *string)
 {
     if (JSString *str = ::JS_InternString(cx, string)) {
         id = INTERNED_STRING_TO_JSID(cx, str);
         return true;
     }
     return false;
@@ -131,24 +129,24 @@ bool
 Unwrap(JSContext *cx, jsval v, NoType **ppArg, nsISupports **ppArgRef, jsval *vp)
 {
     NS_RUNTIMEABORT("We try to unwrap an argument for a noop?");
     return false;
 }
 
 template<class LC>
 typename ListBase<LC>::Properties ListBase<LC>::sProtoProperties[] = {
-    { s_VOID_id, NULL, NULL }
+    { JSID_VOID, NULL, NULL }
 };
 template<class LC>
 size_t ListBase<LC>::sProtoPropertiesCount = 0;
 
 template<class LC>
 typename ListBase<LC>::Methods ListBase<LC>::sProtoMethods[] = {
-    { s_VOID_id, NULL, 0 }
+    { JSID_VOID, NULL, 0 }
 };
 template<class LC>
 size_t ListBase<LC>::sProtoMethodsCount = 0;
 
 template<class LC>
 ListBase<LC> ListBase<LC>::instance;
 
 template<class LC>