Browse Source

Merge pull request #4947

6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
321fd7dbee
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/script/script.h

2
src/script/script.h

@ -340,9 +340,7 @@ public:
CScript() { } CScript() { }
CScript(const CScript& b) : std::vector<unsigned char>(b.begin(), b.end()) { } 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) { } 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) { } CScript(const unsigned char* pbegin, const unsigned char* pend) : std::vector<unsigned char>(pbegin, pend) { }
#endif
CScript& operator+=(const CScript& b) CScript& operator+=(const CScript& b)
{ {

Loading…
Cancel
Save