Merge branch 'master' of github.com:novacoin-project/novacoin
authorCryptoManiac <balthazar@yandex.ru>
Mon, 7 Mar 2016 01:54:19 +0000 (04:54 +0300)
committerCryptoManiac <balthazar@yandex.ru>
Mon, 7 Mar 2016 01:54:19 +0000 (04:54 +0300)
src/bitcoinrpc.cpp
src/walletdb.cpp

index f52ae80..d0f4e15 100644 (file)
@@ -427,7 +427,8 @@ int ReadHTTPStatus(std::basic_istream<char>& stream, int &proto)
     string str;
     getline(stream, str);
     vector<string> vWords;
-    boost::split(vWords, str, boost::is_any_of(" "));
+    istringstream iss(str);
+    copy(istream_iterator<string>(iss), istream_iterator<string>(), back_inserter(vWords));
     if (vWords.size() < 2)
         return HTTP_INTERNAL_SERVER_ERROR;
     proto = 0;
index a072f18..5c78ff2 100644 (file)
@@ -879,7 +879,8 @@ bool ImportWallet(CWallet *pwallet, const string& strLocation)
               continue;
 
           std::vector<std::string> vstr;
-          boost::split(vstr, line, boost::is_any_of(" "));
+          istringstream iss(line);
+          copy(istream_iterator<string>(iss), istream_iterator<string>(), back_inserter(vstr));
           if (vstr.size() < 2)
               continue;
           CBitcoinSecret vchSecret;