BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent aa340a8f07 6134b43ba9
commit 321fd7dbee
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/script.h
View File

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