From: CryptoManiac Date: Mon, 7 Mar 2016 01:54:19 +0000 (+0300) Subject: Merge branch 'master' of github.com:novacoin-project/novacoin X-Git-Tag: nvc-v0.5.6~23 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=75744e6526193604bfbcc6be3a3793315556f12c;hp=9903bc0d7229d446d9efd874ccef2fb59b2cf610 Merge branch 'master' of github.com:novacoin-project/novacoin --- diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index f52ae80..d0f4e15 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -427,7 +427,8 @@ int ReadHTTPStatus(std::basic_istream& stream, int &proto) string str; getline(stream, str); vector vWords; - boost::split(vWords, str, boost::is_any_of(" ")); + istringstream iss(str); + copy(istream_iterator(iss), istream_iterator(), back_inserter(vWords)); if (vWords.size() < 2) return HTTP_INTERNAL_SERVER_ERROR; proto = 0; diff --git a/src/walletdb.cpp b/src/walletdb.cpp index a072f18..5c78ff2 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -879,7 +879,8 @@ bool ImportWallet(CWallet *pwallet, const string& strLocation) continue; std::vector vstr; - boost::split(vstr, line, boost::is_any_of(" ")); + istringstream iss(line); + copy(istream_iterator(iss), istream_iterator(), back_inserter(vstr)); if (vstr.size() < 2) continue; CBitcoinSecret vchSecret;