diff options
author | Andras Becsi <andras.becsi@nokia.com> | 2012-04-10 19:20:32 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-12 13:25:19 +0200 |
commit | 80451ee3dcb4b50f591759018edad27098eeb371 (patch) | |
tree | cfeac47a6f1bde35d6c237d4245879bb6aedbda0 /src/3rdparty/javascriptcore | |
parent | b270b953bdc4490f09fcf21a1551b1d3523d8e2e (diff) | |
download | qtscript-80451ee3dcb4b50f591759018edad27098eeb371.tar.gz |
Fix the build with gcc 4.7.
The dependent base class of nested classes has to be fully qualified.
Change-Id: If166ad3578fd65ea84899da65d2b85283dbcca9d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore')
-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) { |