Use MakeUnique<T>(...) instead of std::unique_ptr<T>(new T(...))

random-zebra · random-zebra · commit ec9175957e1d · 2021-07-25T20:55:24.000+02:00
>>> backports bitcoin/bitcoin@3e09b39 +bitcoin@a357293
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
@@ -7,15 +7,16 @@
 
 #include "chainparams.h"
 #include "crypto/hmac_sha256.h"
+#include "guiinterface.h"
 #include "httpserver.h"
 #include "key_io.h"
 #include "rpc/protocol.h"
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
+#include "util/memory.h"
 #include "util/system.h"
 #include "utilstrencodings.h"
-#include "guiinterface.h"
 
 #include <boost/algorithm/string.hpp> // boost::trim
 
@@ -233,7 +234,7 @@ bool StartHTTPRPC()
     RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC);
 #endif
     assert(EventBase());
-    httpRPCTimerInterface = std::unique_ptr<HTTPRPCTimerInterface>(new HTTPRPCTimerInterface(EventBase()));
+    httpRPCTimerInterface = MakeUnique<HTTPRPCTimerInterface>(EventBase());
     RPCSetTimerInterface(httpRPCTimerInterface.get());
     return true;
 }
diff --git a/src/net.cpp b/src/net.cpp
@@ -23,6 +23,7 @@
 #include "primitives/transaction.h"
 #include "random.h"
 #include "scheduler.h"
+#include "util/memory.h"
 #include "validation.h"
 
 #ifdef WIN32
@@ -1985,7 +1986,7 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c
 
     if (semOutbound == nullptr) {
         // initialize semaphore
-        semOutbound = std::unique_ptr<CSemaphore>(new CSemaphore(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections)));
+        semOutbound = MakeUnique<CSemaphore>(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections));
     }
 
     if (pnodeLocalHost == nullptr) {
@@ -2332,7 +2333,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn
     nNextLocalAddrSend = 0;
     nNextAddrSend = 0;
     fRelayTxes = false;
-    pfilter = std::unique_ptr<CBloomFilter>(new CBloomFilter());
+    pfilter = MakeUnique<CBloomFilter>();
     timeLastMempoolReq = 0;
     nPingNonceSent = 0;
     nPingUsecStart = 0;
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -21,6 +21,7 @@
 #include "sporkdb.h"
 #include "txmempool.h"
 #include "txdb.h"
+#include "util/memory.h"
 #include "validation.h"
 
 #include <boost/test/unit_test.hpp>
@@ -83,7 +84,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
         GetMainSignals().RegisterBackgroundSignalScheduler(scheduler);
 
         // Register EvoNotificationInterface
-        g_connman = std::unique_ptr<CConnman>(new CConnman(0x1337, 0x1337)); // Deterministic randomness for tests.
+        g_connman = MakeUnique<CConnman>(0x1337, 0x1337); // Deterministic randomness for tests.
         connman = g_connman.get();
         pEvoNotificationInterface = new EvoNotificationInterface(*connman);
         RegisterValidationInterface(pEvoNotificationInterface);
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -10,6 +10,7 @@
 #include "guiinterfaceutil.h"
 #include "hash.h"
 #include "protocol.h"
+#include "util/memory.h"
 #include "util/system.h"
 #include "utilstrencodings.h"
 #include "wallet/walletutil.h"
@@ -462,7 +463,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(new Db(env->dbenv.get(), 0));
+            std::unique_ptr<Db> pdb_temp = MakeUnique<Db>(env->dbenv.get(), 0);
 
             bool fMockDb = env->IsMock();
             if (fMockDb) {
@@ -589,7 +590,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 = std::unique_ptr<Db>(new Db(env->dbenv.get(), 0));
+                    std::unique_ptr<Db> pdbCopy = MakeUnique<Db>(env->dbenv.get(), 0);
 
                     int ret = pdbCopy->open(NULL, // Txn pointer
                         strFileRes.c_str(),       // Filename
