From: svost <ya.nowa@yandex.ru>
Date: Tue, 11 Oct 2016 13:08:16 +0000 (+0300)
Subject: Remove boost replace_all function
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=fc5ac139a14154d6c87f6f6df6cca5288b131565;hp=635e3b8b61321996bac1f31d3b1f76fe2838204f

Remove boost replace_all function
---

diff --git a/src/main.cpp b/src/main.cpp
index 4f1d2d8..aa50e82 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <regex>
+
 #include "alert.h"
 #include "checkpoints.h"
 #include "db.h"
@@ -11,7 +13,6 @@
 #include "ui_interface.h"
 #include "checkqueue.h"
 #include "kernel.h"
-#include <boost/algorithm/string/replace.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
@@ -2292,10 +2293,8 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)
     auto strCmd = GetArg("-blocknotify", "");
 
     if (!fIsInitialDownload && !strCmd.empty())
-    {
-        boost::replace_all(strCmd, "%s", hashBestChain.GetHex());
-        boost::thread t(runCommand, strCmd); // thread runs free
-    }
+        // thread runs free
+        boost::thread t(runCommand, regex_replace(strCmd, static_cast<regex>("%s"), hashBestChain.GetHex()));
 
     return true;
 }
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 5813953..d63db2a 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -3,6 +3,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <regex>
+
 #include "txdb.h"
 #include "wallet.h"
 #include "walletdb.h"
@@ -11,7 +13,6 @@
 #include "base58.h"
 #include "kernel.h"
 #include "coincontrol.h"
-#include <boost/algorithm/string/replace.hpp>
 #include <openssl/bio.h>
 
 #include "main.h"
@@ -784,11 +785,9 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
         // notify an external script when a wallet transaction comes in or is updated
         auto strCmd = GetArg("-walletnotify", "");
 
-        if ( !strCmd.empty())
-        {
-            boost::replace_all(strCmd, "%s", wtxIn.GetHash().GetHex());
-            boost::thread t(runCommand, strCmd); // thread runs free
-        }
+        if (!strCmd.empty())
+            // thread runs free
+            boost::thread t(runCommand, regex_replace(strCmd, static_cast<regex>("%s"), wtxIn.GetHash().GetHex()));
 
     }
     return true;