From d9b4adb7e88597686889701e0b810d6c2dd4148a Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 25 Jul 2016 05:20:32 +0000 Subject: [PATCH] per apathy - other files/libs will need this where boost is used - [PATCH] Replace boost::shared_ptr usage with std::shared_ptr --- .../src/shared/UniqueNameList.cpp | 30 +++++++++---------- .../sharedUtility/src/shared/UniqueNameList.h | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.cpp b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.cpp index 1a93ed8c..f0f3173a 100755 --- a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.cpp +++ b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.cpp @@ -8,10 +8,10 @@ #include "sharedUtility/FirstSharedUtility.h" #include "sharedUtility/UniqueNameList.h" -#include "boost/smart_ptr.hpp" #include "sharedFoundation/CrcLowerString.h" #include +#include #include #include @@ -31,24 +31,24 @@ public: struct LessNameComparator { - bool operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const; + bool operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const; - bool operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const; - bool operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const; + bool operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const; + bool operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const; - bool operator ()(const boost::shared_ptr &lhs, const CrcLowerString &rhs) const; - bool operator ()(const CrcLowerString &lhs, const boost::shared_ptr &rhs) const; + bool operator ()(const std::shared_ptr &lhs, const CrcLowerString &rhs) const; + bool operator ()(const CrcLowerString &lhs, const std::shared_ptr &rhs) const; }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - public: - NameInfo(const boost::shared_ptr &name, int index); + NameInfo(const std::shared_ptr &name, int index); public: - boost::shared_ptr m_name; + std::shared_ptr m_name; int m_index; private: @@ -62,35 +62,35 @@ private: //lint -esym(1714, LessNameComparator::operator*) // not referenced // wrong, in STL functions -inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const +inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const { return *(lhs->m_name.get()) < *(rhs->m_name.get()); } // ---------------------------------------------------------------------- -inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const +inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const { return *(lhs.get()) < *(rhs->m_name.get()); } // ---------------------------------------------------------------------- -inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const boost::shared_ptr &lhs, const boost::shared_ptr &rhs) const +inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const std::shared_ptr &lhs, const std::shared_ptr &rhs) const { return *(lhs->m_name.get()) < *(rhs.get()); } // ---------------------------------------------------------------------- -inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const boost::shared_ptr &lhs, const CrcLowerString &rhs) const +inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const std::shared_ptr &lhs, const CrcLowerString &rhs) const { return *(lhs->m_name.get()) < rhs; } // ---------------------------------------------------------------------- -inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const CrcLowerString &lhs, const boost::shared_ptr &rhs) const +inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const CrcLowerString &lhs, const std::shared_ptr &rhs) const { return lhs < *(rhs->m_name.get()); } @@ -99,7 +99,7 @@ inline bool UniqueNameList::NameInfo::LessNameComparator::operator ()(const CrcL // class UniqueNameList::NameInfo // ====================================================================== -UniqueNameList::NameInfo::NameInfo(const boost::shared_ptr &name, int index) +UniqueNameList::NameInfo::NameInfo(const std::shared_ptr &name, int index) : m_name(name), m_index(index) { @@ -144,7 +144,7 @@ int UniqueNameList::submitName(const SharedCrcLowerString &name) //-- create it const int newIndex = static_cast(m_nameInfoByName->size()); - boost::shared_ptr newNameInfo(new NameInfo(name, newIndex)); + std::shared_ptr newNameInfo = std::make_shared(name, newIndex); //-- add to lists IGNORE_RETURN(m_nameInfoByName->insert(result.first, newNameInfo)); diff --git a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h index d96f5665..37958778 100755 --- a/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h +++ b/engine/shared/library/sharedUtility/src/shared/UniqueNameList.h @@ -13,7 +13,7 @@ class CrcLowerString; -namespace boost +namespace std { template class shared_ptr; @@ -37,7 +37,7 @@ class UniqueNameList { public: - typedef boost::shared_ptr SharedCrcLowerString; + typedef std::shared_ptr SharedCrcLowerString; public: @@ -56,7 +56,7 @@ private: struct NameInfo; - typedef stdvector >::fwd NameInfoVector; + typedef stdvector >::fwd NameInfoVector; private: