119248cace
- fix gcc-4.7 issue
28 lines
2.0 KiB
Diff
28 lines
2.0 KiB
Diff
diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
|
|
--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100
|
|
+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100
|
|
@@ -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 -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
|
|
--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100
|
|
+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100
|
|
@@ -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)
|
|
{
|