[Refactor] Replace MakeUnique with std::make_unique (C++14)

src/Makefile.am

@@ -286,7 +286,6 @@ BITCOIN_CORE_H = \
   uint256.h \
   undo.h \
   util/blockstatecatcher.h \
-  util/memory.h \
   util/system.h \
   util/macros.h \
   util/string.h \

src/httprpc.cpp

@@ -14,7 +14,6 @@
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
-#include "util/memory.h"
 #include "util/system.h"
 #include "utilstrencodings.h"
 
@@ -234,7 +233,7 @@ bool StartHTTPRPC()
     RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
 #endif
     assert(EventBase());
-    httpRPCTimerInterface = MakeUnique<HTTPRPCTimerInterface>(EventBase());
+    httpRPCTimerInterface = std::make_unique<HTTPRPCTimerInterface>(EventBase());
     RPCSetTimerInterface(httpRPCTimerInterface.get());
     return true;
 }

src/init.cpp

@@ -1344,7 +1344,7 @@ bool AppInitMain()
     // need to reindex later.
 
     assert(!g_connman);
-    g_connman = MakeUnique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max()));
+    g_connman = std::make_unique<CConnman>(GetRand(std::numeric_limits<uint64_t>::max()), GetRand(std::numeric_limits<uint64_t>::max()));
     CConnman& connman = *g_connman;
 
     peerLogic.reset(new PeerLogicValidation(&connman));

src/interfaces/handler.cpp

@@ -5,8 +5,6 @@
 
 #include <interfaces/handler.h>
 
-#include <util/memory.h>
-
 #include <boost/signals2/connection.hpp>
 #include <utility>
 
@@ -27,7 +25,7 @@ class HandlerImpl : public Handler
 
 std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)
 {
-    return MakeUnique<HandlerImpl>(std::move(connection));
+    return std::make_unique<HandlerImpl>(std::move(connection));
 }
 
 } // namespace interfaces

src/net.cpp

@@ -20,7 +20,6 @@
 #include "netmessagemaker.h"
 #include "primitives/transaction.h"
 #include "scheduler.h"
-#include "util/memory.h"
 #include "validation.h"
 
 #ifdef WIN32
@@ -1983,7 +1982,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
 
     if (semOutbound == nullptr) {
         // initialize semaphore
-        semOutbound = MakeUnique<CSemaphore>(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
+        semOutbound = std::make_unique<CSemaphore>(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
     }
 
     if (pnodeLocalHost == nullptr) {
@@ -2330,7 +2329,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     nNextLocalAddrSend = 0;
     nNextAddrSend = 0;
     fRelayTxes = false;
-    pfilter = MakeUnique<CBloomFilter>();
+    pfilter = std::make_unique<CBloomFilter>();
     timeLastMempoolReq = 0;
     nPingNonceSent = 0;
     nPingUsecStart = 0;

src/qt/pivx/masternodeswidget.cpp

@@ -259,7 +259,7 @@ void MasterNodesWidget::onStartAllClicked(int type)
     if (isLoading) {
         inform(tr("Background task is being executed, please wait"));
     } else {
-        std::unique_ptr<WalletModel::UnlockContext> pctx = MakeUnique<WalletModel::UnlockContext>(walletModel->requestUnlock());
+        std::unique_ptr<WalletModel::UnlockContext> pctx = std::make_unique<WalletModel::UnlockContext>(walletModel->requestUnlock());
         if (!pctx->isValid()) {
             warn(tr("Start ALL masternodes failed"), tr("Wallet unlock cancelled"));
             return;

src/qt/pivx/send.cpp

@@ -421,7 +421,7 @@ void SendWidget::ProcessSend(QList<SendCoinsRecipient>& recipients, bool hasShie
         }
     }
 
-    auto ptrUnlockedContext = MakeUnique<WalletModel::UnlockContext>(walletModel->requestUnlock());
+    auto ptrUnlockedContext = std::make_unique<WalletModel::UnlockContext>(walletModel->requestUnlock());
     if (!ptrUnlockedContext->isValid()) {
         // Unlock wallet was cancelled
         inform(tr("Cannot send, wallet locked"));

src/qt/pivx/topbar.cpp

@@ -544,7 +544,7 @@ void TopBar::showUpgradeDialog(const QString& message)
 {
     QString title = tr("Wallet Upgrade");
     if (ask(title, message)) {
-        std::unique_ptr<WalletModel::UnlockContext> pctx = MakeUnique<WalletModel::UnlockContext>(walletModel->requestUnlock());
+        std::unique_ptr<WalletModel::UnlockContext> pctx = std::make_unique<WalletModel::UnlockContext>(walletModel->requestUnlock());
         if (!pctx->isValid()) {
             warn(tr("Upgrade Wallet"), tr("Wallet unlock cancelled"));
             return;

src/rpc/mining.cpp

@@ -123,7 +123,7 @@ UniValue generate(const JSONRPCRequest& request)
         EnsureWalletIsUnlocked(pwallet);
     } else {
         // Coinbase key
-        reservekey = MakeUnique<CReserveKey>(pwallet);
+        reservekey = std::make_unique<CReserveKey>(pwallet);
         CPubKey pubkey;
         if (!reservekey->GetReservedKey(pubkey)) throw JSONRPCError(RPC_INTERNAL_ERROR, "Error: Cannot get key from keypool");
         coinbaseScript = GetScriptForDestination(pubkey.GetID());

src/test/fuzz/fuzz.cpp

@@ -8,7 +8,6 @@
 
 #include "chainparams.h"
 #include "pubkey.h"
-#include "util/memory.h"
 
 
 static bool read_stdin(std::vector<uint8_t>& data)
@@ -25,7 +24,7 @@ static bool read_stdin(std::vector<uint8_t>& data)
 
 static void initialize()
 {
-    const static auto verify_handle = MakeUnique<ECCVerifyHandle>();
+    const static auto verify_handle = std::make_unique<ECCVerifyHandle>();
     SelectParams(CBaseChainParams::MAIN);
 }
 

src/test/net_tests.cpp

@@ -9,7 +9,6 @@
 #include "netbase.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util/memory.h"
 
 #include "test/test_pivx.h"
 
@@ -198,7 +197,7 @@ BOOST_AUTO_TEST_CASE(ipv4_peer_with_ipv6_addrMe_test)
     in_addr ipv4AddrPeer;
     ipv4AddrPeer.s_addr = 0xa0b0c001;
     CAddress addr = CAddress(CService(ipv4AddrPeer, 7777), NODE_NETWORK);
-    std::unique_ptr<CNode> pnode = MakeUnique<CNode>(0, NODE_NETWORK, 0, INVALID_SOCKET, addr, 0, 0, std::string{}, false);
+    std::unique_ptr<CNode> pnode = std::make_unique<CNode>(0, NODE_NETWORK, 0, INVALID_SOCKET, addr, 0, 0, std::string{}, false);
     pnode->fSuccessfullyConnected.store(true);
 
     // the peer claims to be reaching us via IPv6

src/test/test_pivx.cpp

@@ -20,7 +20,6 @@
 #include "script/sigcache.h"
 #include "sporkdb.h"
 #include "txmempool.h"
-#include "util/memory.h"
 #include "validation.h"
 
 #include <boost/test/unit_test.hpp>
@@ -83,7 +82,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         GetMainSignals().RegisterBackgroundSignalScheduler(scheduler);
 
         // Register EvoNotificationInterface
-        g_connman = MakeUnique<CConnman>(0x1337, 0x1337); // Deterministic randomness for tests.
+        g_connman = std::make_unique<CConnman>(0x1337, 0x1337); // Deterministic randomness for tests.
         connman = g_connman.get();
         pEvoNotificationInterface = new EvoNotificationInterface(*connman);
         RegisterValidationInterface(pEvoNotificationInterface);

src/wallet/db.cpp

@@ -10,7 +10,6 @@
 #include "guiinterfaceutil.h"
 #include "hash.h"
 #include "protocol.h"
-#include "util/memory.h"
 #include "util/system.h"
 #include "utilstrencodings.h"
 #include "wallet/walletutil.h"
@@ -463,7 +462,7 @@ CDB::CDB(CWalletDBWrapper& dbw, const char* pszMode, bool fFlushOnCloseIn) : pdb
         pdb = env->mapDb[strFilename];
         if (pdb == nullptr) {
             int ret;
-            std::unique_ptr<Db> pdb_temp = MakeUnique<Db>(env->dbenv.get(), 0);
+            std::unique_ptr<Db> pdb_temp = std::make_unique<Db>(env->dbenv.get(), 0);
 
             bool fMockDb = env->IsMock();
             if (fMockDb) {
@@ -590,7 +589,7 @@ bool CDB::Rewrite(CWalletDBWrapper& dbw, const char* pszSkip)
                 std::string strFileRes = strFile + ".rewrite";
                 { // surround usage of db with extra {}
                     CDB db(dbw, "r");
-                    std::unique_ptr<Db> pdbCopy = MakeUnique<Db>(env->dbenv.get(), 0);
+                    std::unique_ptr<Db> pdbCopy = std::make_unique<Db>(env->dbenv.get(), 0);
 
                     int ret = pdbCopy->open(NULL, // Txn pointer
                         strFileRes.c_str(),       // Filename

src/wallet/db.h

@@ -9,7 +9,6 @@
 
 #include "clientversion.h"
 #include "fs.h"
-#include "util/memory.h"
 #include "serialize.h"
 #include "streams.h"
 #include "sync.h"

src/wallet/test/wallet_sapling_transactions_validations_tests.cpp

@@ -24,7 +24,7 @@ struct TestSaplingChainSetup: public TestChain100Setup
         initZKSNARKS(); // init zk-snarks lib
 
         bool fFirstRun;
-        pwalletMain = MakeUnique<CWallet>("testWallet", CWalletDBWrapper::CreateMock());
+        pwalletMain = std::make_unique<CWallet>("testWallet", CWalletDBWrapper::CreateMock());
         pwalletMain->LoadWallet(fFirstRun);
         RegisterValidationInterface(pwalletMain.get());
 

src/wallet/wallet.h

@@ -25,7 +25,6 @@
 #include "sapling/address.h"
 #include "guiinterface.h"
 #include "util/system.h"
-#include "util/memory.h"
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 #include "script/ismine.h"
@@ -583,8 +582,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool fDecryptionThoroughlyChecked{false};
 
     //! Key manager //
-    std::unique_ptr<ScriptPubKeyMan> m_spk_man = MakeUnique<ScriptPubKeyMan>(this);
-    std::unique_ptr<SaplingScriptPubKeyMan> m_sspk_man = MakeUnique<SaplingScriptPubKeyMan>(this);
+    std::unique_ptr<ScriptPubKeyMan> m_spk_man = std::make_unique<ScriptPubKeyMan>(this);
+    std::unique_ptr<SaplingScriptPubKeyMan> m_sspk_man = std::make_unique<SaplingScriptPubKeyMan>(this);
 
     //! the current wallet version: clients below this version are not able to load the wallet
     int nWalletVersion;