diff options
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h | 4 | ||||
-rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h index 7c20272..917c0ff 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h @@ -57,9 +57,7 @@ namespace JSC { class JSGlobalObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - - struct JSGlobalObjectData : public JSVariableObjectData { + struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { // We use an explicit destructor function pointer instead of a // virtual destructor because we want to avoid adding a vtable // pointer to this struct. Adding a vtable pointer would force the diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h index 2542878..8bb6b90 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h @@ -32,8 +32,7 @@ namespace JSC{ class JSStaticScopeObject : public JSVariableObject { protected: - using JSVariableObject::JSVariableObjectData; - struct JSStaticScopeObjectData : public JSVariableObjectData { + struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { JSStaticScopeObjectData() : JSVariableObjectData(&symbolTable, ®isterStore + 1) { |