diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp old mode 100644 new mode 100755 index b028675e5d..ea40179bbe --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -32,8 +32,6 @@ #include #include -#include - static bool fCreateBlank; static std::map registers; static const int CONTINUE_EXECUTION=-1; @@ -254,8 +252,7 @@ static T TrimAndParse(const std::string& int_str, const std::string& err) static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInput) { - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); // separate TXID:VOUT in string if (vStrInputParts.size()<2) @@ -290,8 +287,7 @@ static void MutateTxAddInput(CMutableTransaction& tx, const std::string& strInpu static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strInput) { // Separate into VALUE:ADDRESS - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); if (vStrInputParts.size() < 2) throw std::runtime_error("TX output missing or too many separators"); @@ -329,8 +325,7 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& strInput) { // Separate into VALUE:PUBKEY[:FLAGS] - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); if (vStrInputParts.size() < 2 || vStrInputParts.size() > 3) throw std::runtime_error("TX output missing or too many separators"); @@ -373,8 +368,7 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& strInput) { // Separate into VALUE:REQUIRED:NUMKEYS:PUBKEY1:PUBKEY2:....[:FLAGS] - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); // Check that there are enough parameters if (vStrInputParts.size()<3) @@ -449,8 +443,7 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn CAmount value = 0; // separate [VALUE:]DATA[:ASSET] in string - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); // Check that there are enough parameters if (vStrInputParts[0].empty()) @@ -494,8 +487,7 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& strInput) { // separate VALUE:SCRIPT[:FLAGS] - std::vector vStrInputParts; - boost::split(vStrInputParts, strInput, boost::is_any_of(":")); + std::vector vStrInputParts = SplitString(strInput, ':'); if (vStrInputParts.size() < 2) throw std::runtime_error("TX output missing separator"); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 68ddf91d63..f7c72340b2 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -12,13 +12,12 @@ #include #include #include