Fix openssl cross-compiling

[novacoin.git] / src / script.h

diff --git a/src/script.h b/src/script.h
index c24ab9c..f10a8cf 100644 (file)
--- a/src/script.h
+++ b/src/script.h
@@ -318,6 +318,8 @@ public:
     CScript(const uint8_t* pbegin, const uint8_t* pend) : std::vector<uint8_t>(pbegin, pend) { }
 #endif
 
+    CScript& operator=(const CScript&) = default;
+
     CScript& operator+=(const CScript& b)
     {
         insert(end(), b.begin(), b.end());
@@ -380,7 +382,7 @@ public:
 
     CScript& operator<<(const CPubKey& key)
     {
-        std::vector<uint8_t> vchKey = key.Raw();
+        std::vector<uint8_t> vchKey(key.begin(), key.end());
         return (*this) << vchKey;
     }
 
@@ -586,7 +588,7 @@ public:
 
     void SetDestination(const CTxDestination& address);
     void SetAddress(const CBitcoinAddress& dest);
-    void SetMultisig(int nRequired, const std::vector<CKey>& keys);
+    void SetMultisig(int nRequired, const std::vector<CPubKey>& keys);
 
 
     void PrintHex() const