Merge bitcoin#2467: [Refactor] Replace MakeUnique with std::make_unique (C++14)

68a36a3 [Cleanup] Remove no longer needed util/memory.h (random-zebra)
24b0f73 scripted-diff: replace MakeUnique with std::make_unique (random-zebra)

Pull request description:

  Also remove `util/memory.h` and relative header includes.
  As suggested by @Fuzzbawls in PIVX-Project#2462 (review).
  Based on top of
  - [x] bitcoin#2462

ACKs for top commit:
  furszy:
    utACK 68a36a3
  Fuzzbawls:
    ACK 68a36a3

Tree-SHA512: 4dffacd07ffa24918a91f141e03838c6deb8e448f3cff0dfe0adbbb014e10568ff58bc0828ba8950d05ef4908a4d860f8755d1fa12df57192255a429b32bd605

Author: random-zebra

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);
 }