Merge pull request #4947

6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
This commit is contained in:
Wladimir J. van der Laan 2014-09-22 10:33:36 +02:00
commit 321fd7dbee
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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)
{