From 7b681b091365b138a4a9665dd4dc28c6c34ee56f Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Tue, 28 Oct 2014 15:05:38 +0100
Subject: [PATCH 1/2] fix for compiling under llvm

---
 libdevcore/FixedHash.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdevcore/FixedHash.h b/libdevcore/FixedHash.h
index 284745c64..41d140cad 100644
--- a/libdevcore/FixedHash.h
+++ b/libdevcore/FixedHash.h
@@ -158,7 +158,7 @@ public:
 		return ret;
 	}
 
-	template <unsigned P, unsigned M> inline FixedHash& shiftBloom(FixedHash<M> const& _h) { return (*this |= _h.nbloom<P, N>()); }
+	template <unsigned P, unsigned M> inline FixedHash& shiftBloom(FixedHash<M> const& _h) { return (*this |= _h.template nbloom<P, N>()); }
 
 	template <unsigned P, unsigned M> inline FixedHash<M> nbloom() const
 	{

From e17e240b5dfc033e14c8e91122ef5522c293e28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Tue, 28 Oct 2014 16:26:33 +0100
Subject: [PATCH 2/2] Fix VM test code loading conditions

---
 test/vm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/vm.cpp b/test/vm.cpp
index 40a0a862b..d69f03fda 100644
--- a/test/vm.cpp
+++ b/test/vm.cpp
@@ -359,9 +359,9 @@ void FakeExtVM::importExec(mObject& _o)
 	code = &thisTxCode;
 	if (_o["code"].type() == str_type)
 		if (_o["code"].get_str().find_first_of("0x") == 0)
-			thisTxCode = compileLLL(_o["code"].get_str());
-		else
 			thisTxCode = fromHex(_o["code"].get_str().substr(2));
+		else
+			thisTxCode = compileLLL(_o["code"].get_str());
 	else if (_o["code"].type() == array_type)
 		for (auto const& j: _o["code"].get_array())
 			thisTxCode.push_back(toByte(j));