Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

1 files changed, 0 insertions, 41 deletions

diff --git a/src/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h
index 2257cb2b9a..e8ae687036 100644
--- a/src/3rdparty/masm/assembler/X86Assembler.h
+++ b/src/3rdparty/masm/assembler/X86Assembler.h
@@ -255,47 +255,6 @@ public:
     {
     }
 
-#if defined(V4_BOOTSTRAP)
-    template <typename LabelType>
-    class Jump {
-        template<class TemplateAssemblerType>
-        friend class AbstractMacroAssembler;
-        friend class Call;
-        template <typename, template <typename> class> friend class LinkBufferBase;
-    public:
-        Jump()
-        {
-        }
-
-        Jump(AssemblerLabel jmp)
-            : m_label(jmp)
-        {
-        }
-
-        LabelType label() const
-        {
-            LabelType result;
-            result.m_label = m_label;
-            return result;
-        }
-
-        void link(AbstractMacroAssembler<X86Assembler>* masm) const
-        {
-            masm->m_assembler.linkJump(m_label, masm->m_assembler.label());
-        }
-
-        void linkTo(LabelType label, AbstractMacroAssembler<X86Assembler>* masm) const
-        {
-            masm->m_assembler.linkJump(m_label, label.label());
-        }
-
-        bool isSet() const { return m_label.isSet(); }
-
-    private:
-        AssemblerLabel m_label;
-    };
-#endif
-
     // Stack operations:
 
     void push_r(RegisterID reg)