mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
Merge pull request #4947
6134b43
Fixing condition 'sabotaging' MSVC build (ENikS)
This commit is contained in:
commit
321fd7dbee
@ -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…
Reference in New Issue
Block a user