36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
Fix compile error when using toolchains based on GCC 4.7.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Ken Werner <ken.werner@linaro.org>
|
|
|
|
Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
|
|
===================================================================
|
|
--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
|
|
+++ qt-everywhere-opensource-src-4.8.0/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
|
|
Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
|
|
===================================================================
|
|
--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
|
|
+++ qt-everywhere-opensource-src-4.8.0/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 JSVariableObjectData::JSVariableObjectData {
|
|
JSStaticScopeObjectData()
|
|
: JSVariableObjectData(&symbolTable, ®isterStore + 1)
|
|
{
|