diff options
Diffstat (limited to 'src/3rdparty/masm')
-rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 10 | ||||
-rw-r--r-- | src/3rdparty/masm/stubs/JSGlobalData.h | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index a6911b34f0..49136a9887 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -59,7 +59,7 @@ namespace JSC { class JSGlobalData; struct ExecutableMemoryHandle : public RefCounted<ExecutableMemoryHandle> { - ExecutableMemoryHandle(QQmlJS::VM::ExecutableAllocator *allocator, int size) + ExecutableMemoryHandle(QV4::ExecutableAllocator *allocator, int size) : m_allocator(allocator) , m_size(size) { @@ -79,13 +79,13 @@ struct ExecutableMemoryHandle : public RefCounted<ExecutableMemoryHandle> { void* start() { return m_allocation->start(); } int sizeInBytes() { return m_size; } - QQmlJS::VM::ExecutableAllocator *m_allocator; - QQmlJS::VM::ExecutableAllocator::Allocation *m_allocation; + QV4::ExecutableAllocator *m_allocator; + QV4::ExecutableAllocator::Allocation *m_allocation; int m_size; }; struct ExecutableAllocator { - ExecutableAllocator(QQmlJS::VM::ExecutableAllocator *alloc) + ExecutableAllocator(QV4::ExecutableAllocator *alloc) : realAllocator(alloc) {} @@ -125,7 +125,7 @@ struct ExecutableAllocator { #endif } - QQmlJS::VM::ExecutableAllocator *realAllocator; + QV4::ExecutableAllocator *realAllocator; }; } diff --git a/src/3rdparty/masm/stubs/JSGlobalData.h b/src/3rdparty/masm/stubs/JSGlobalData.h index 281a64de83..c294f5ee50 100644 --- a/src/3rdparty/masm/stubs/JSGlobalData.h +++ b/src/3rdparty/masm/stubs/JSGlobalData.h @@ -44,17 +44,11 @@ #include "ExecutableAllocator.h" #include "WeakRandom.h" -namespace QQmlJS { -namespace VM { -class ExecutableAllocator; -} -} - namespace JSC { class JSGlobalData { public: - JSGlobalData(QQmlJS::VM::ExecutableAllocator *realAllocator) + JSGlobalData(QV4::ExecutableAllocator *realAllocator) : executableAllocator(realAllocator) {} ExecutableAllocator executableAllocator; |