diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-03-02 12:10:00 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-02 14:37:03 +0000 |
commit | 60708ee6227df017269146d2c0cfd4238ec25b9f (patch) | |
tree | 1063d04ddd0ea48aa83a516aaf69239c78bc5c7e /src/3rdparty/masm/assembler | |
parent | 71a2dbed467be0041b6793dda868655b2632e830 (diff) |
Fix build in clang5.0
Fixes:
X86Assembler.h:281:19: error: 'm_assembler' is a protected member of
'JSC::AbstractMacroAssembler<JSC::X86Assembler>'
masm->m_assembler.linkJump(m_label, masm->m_assembler.label());
AbstractMacroAssembler.h:819:19: note: declared protected here
AssemblerType m_assembler;
Change-Id: I04f6dc254e9826b9835a43b604a05ea4c57f661b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler')
-rw-r--r-- | src/3rdparty/masm/assembler/X86Assembler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h index 24462ef38f..46f2cd714a 100644 --- a/src/3rdparty/masm/assembler/X86Assembler.h +++ b/src/3rdparty/masm/assembler/X86Assembler.h @@ -253,6 +253,7 @@ public: { } +#if defined(V4_BOOTSTRAP) template <typename LabelType> class Jump { template<class TemplateAssemblerType> @@ -291,6 +292,7 @@ public: private: AssemblerLabel m_label; }; +#endif // Stack operations: |