From 6f68842208e1025d3769cdea4829407e65b07744 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 27 Jul 2014 14:06:38 +0200 Subject: [PATCH] Avoid _asm from MSVC. --- Assembly.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assembly.h b/Assembly.h index 581e16433..888b373c5 100644 --- a/Assembly.h +++ b/Assembly.h @@ -80,7 +80,7 @@ public: AssemblyItem const& append(AssemblyItem const& _i); AssemblyItem const& append(std::string const& _data) { return append(newPushString(_data)); } AssemblyItem const& append(bytes const& _data) { return append(newData(_data)); } - AssemblyItem appendSubSize(Assembly const& _asm) { auto ret = newSub(_asm); append(newPushSubSize(ret.data())); return ret; } + AssemblyItem appendSubSize(Assembly const& _asmbly) { auto ret = newSub(_asmbly); append(newPushSubSize(ret.data())); return ret; } AssemblyItem appendJump() { auto ret = append(newPushTag()); append(Instruction::JUMP); return ret; } AssemblyItem appendJumpI() { auto ret = append(newPushTag()); append(Instruction::JUMPI); return ret; }