From fce239fb70ef38270f7df9b14f61bbb3afb1c7ee Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 17 Nov 2014 14:17:50 -0800 Subject: [PATCH] replace auto_ptr with unique_ptr --- libraries/networking/src/AccountManager.cpp | 2 +- libraries/networking/src/LimitedNodeList.cpp | 6 +++--- libraries/networking/src/LimitedNodeList.h | 2 +- libraries/networking/src/NodeList.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 0c63ecc731..fe6f95d43e 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -30,7 +30,7 @@ const bool VERBOSE_HTTP_REQUEST_DEBUGGING = false; AccountManager& AccountManager::getInstance(bool forceReset) { - static std::auto_ptr sharedInstance(new AccountManager()); + static std::unique_ptr sharedInstance(new AccountManager()); if (forceReset) { sharedInstance.reset(new AccountManager()); diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index bce1572587..85f59335d8 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -38,19 +38,19 @@ const char SOLO_NODE_TYPES[2] = { const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io"); -std::auto_ptr LimitedNodeList::_sharedInstance; +std::unique_ptr LimitedNodeList::_sharedInstance; LimitedNodeList* LimitedNodeList::createInstance(unsigned short socketListenPort, unsigned short dtlsPort) { NodeType::init(); if (_sharedInstance.get()) { qDebug() << "LimitedNodeList called with existing instance." << - "Releasing auto_ptr, deleting existing instance and creating a new one."; + "Releasing unique_ptr, deleting existing instance and creating a new one."; delete _sharedInstance.release(); } - _sharedInstance = std::auto_ptr(new LimitedNodeList(socketListenPort, dtlsPort)); + _sharedInstance = std::move(std::unique_ptr(new LimitedNodeList(socketListenPort, dtlsPort))); // register the SharedNodePointer meta-type for signals/slots qRegisterMetaType(); diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index d713f69d29..417679dc30 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -177,7 +177,7 @@ signals: void localSockAddrChanged(const HifiSockAddr& localSockAddr); void publicSockAddrChanged(const HifiSockAddr& publicSockAddr); protected: - static std::auto_ptr _sharedInstance; + static std::unique_ptr _sharedInstance; LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort); LimitedNodeList(LimitedNodeList const&); // Don't implement, needed to avoid copies of singleton diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index bf992e7b88..73a63077e9 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -31,12 +31,12 @@ NodeList* NodeList::createInstance(char ownerType, unsigned short socketListenPo if (_sharedInstance.get()) { qDebug() << "NodeList called with existing instance." << - "Releasing auto_ptr, deleting existing instance and creating a new one."; + "Releasing unique_ptr, deleting existing instance and creating a new one."; delete _sharedInstance.release(); } - _sharedInstance = std::auto_ptr(new NodeList(ownerType, socketListenPort, dtlsPort)); + _sharedInstance = std::move(std::unique_ptr(new NodeList(ownerType, socketListenPort, dtlsPort))); // register the SharedNodePointer meta-type for signals/slots qRegisterMetaType();