diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-02-14 13:28:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-02-14 14:06:28 +0100 |
| commit | 4377d44fb7399751ed4f284bb4be7ece494aff6d (patch) | |
| tree | 3e7db5823ba0f3989187961ca8427ff88ded5929 /src/3rdparty/masm/assembler | |
| parent | 63cd0f745bb5a3baf47046b8453159cf34b0a23a (diff) | |
Converted calling runtime functions to new calling convention
Change-Id: I03837e9b392957bd64a6710c1b85b4429556ba06
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/assembler')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h index c2af24060a..89cffb1278 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h @@ -134,6 +134,13 @@ public: ASSERT_VALID_CODE_POINTER(m_value); } + template<typename returnType, typename argType1, typename argType2, typename argType3, typename argType4, typename argType5, typename argType6> + FunctionPtr(returnType(*value)(argType1, argType2, argType3, argType4, argType5, argType6)) + : m_value((void*)value) + { + ASSERT_VALID_CODE_POINTER(m_value); + } + // MSVC doesn't seem to treat functions with different calling conventions as // different types; these methods already defined for fastcall, below. #if CALLING_CONVENTION_IS_STDCALL && !OS(WINDOWS) |