Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/JavaScriptCore/runtime/BooleanObject.h b/Source/JavaScriptCore/runtime/BooleanObject.h
index 299f34174..6944db496 100644
--- a/Source/JavaScriptCore/runtime/BooleanObject.h
+++ b/Source/JavaScriptCore/runtime/BooleanObject.h
@@ -40,11 +40,11 @@ public:
         return boolean;
     }
         
-    static JS_EXPORTDATA const ClassInfo s_info;
+    DECLARE_EXPORT_INFO;
         
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
-        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info);
+        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
     }
 };
 
@@ -52,7 +52,7 @@ BooleanObject* asBooleanObject(JSValue);
 
 inline BooleanObject* asBooleanObject(JSValue value)
 {
-    ASSERT(asObject(value)->inherits(&BooleanObject::s_info));
+    ASSERT(asObject(value)->inherits(BooleanObject::info()));
     return static_cast<BooleanObject*>(asObject(value));
 }