Merge pull request #4947

6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)

diff --git a/src/script/script.h b/src/script/script.h
index 07a4229f853a3e4577b53550a5ace143d094479b..4c9ac74b78b128e7bc7b8c1512fb26e882a978a5 100644 (file)
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -340,9 +340,7 @@ public:
     CScript() { }
     CScript(const CScript& b) : std::vector<unsigned char>(b.begin(), b.end()) { }
     CScript(const_iterator pbegin, const_iterator pend) : std::vector<unsigned char>(pbegin, pend) { }
-#ifndef _MSC_VER
     CScript(const unsigned char* pbegin, const unsigned char* pend) : std::vector<unsigned char>(pbegin, pend) { }
-#endif
 
     CScript& operator+=(const CScript& b)
     {