diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-22 10:33:36 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-22 10:34:12 +0200 |
| commit | 321fd7dbee4dc369f26a7a77fbf238aeaf78af94 (patch) | |
| tree | 9c278a0b1eada6f1e7a3911010bdf6ec890610ff /src | |
| parent | aa340a8f07062600abc84bc0deb47859bd712792 (diff) | |
| parent | 6134b43ba9ffc277a3b0cd8cceb5abe8e5c8bd56 (diff) | |
| download | bitcoin-321fd7dbee4dc369f26a7a77fbf238aeaf78af94.tar.xz | |
Merge pull request #4947
6134b43 Fixing condition 'sabotaging' MSVC build (ENikS)
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/script.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/script/script.h b/src/script/script.h index 07a4229f85..4c9ac74b78 100644 --- 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) { |