From 27e23f29f368e06315f2ea381ef38a3affa93c64 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 16 Feb 2017 14:37:44 +0100 Subject: Remove using namespace std; from headers --- include/astra/AstraObjectManager.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/astra/AstraObjectManager.h') diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 97fde40..579ff27 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -194,7 +194,7 @@ int CAstraObjectManager::store(T* _pDataObject) template bool CAstraObjectManager::hasIndex(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); return it != m_mIndexToObject.end(); } @@ -203,7 +203,7 @@ bool CAstraObjectManager::hasIndex(int _iIndex) const template T* CAstraObjectManager::get(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); if (it != m_mIndexToObject.end()) return it->second; else @@ -216,7 +216,7 @@ template void CAstraObjectManager::remove(int _iIndex) { // find data - typename map::iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::iterator it = m_mIndexToObject.find(_iIndex); if (it == m_mIndexToObject.end()) return; // delete data @@ -232,7 +232,7 @@ void CAstraObjectManager::remove(int _iIndex) template int CAstraObjectManager::getIndex(const T* _pObject) const { - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { if ((*it).second == _pObject) return (*it).first; } return 0; @@ -244,7 +244,7 @@ int CAstraObjectManager::getIndex(const T* _pObject) const template void CAstraObjectManager::clear() { - for (typename map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { // delete data delete (*it).second; (*it).second = 0; @@ -257,7 +257,7 @@ void CAstraObjectManager::clear() // Print info to string template std::string CAstraObjectManager::getInfo(int index) const { - typename map::const_iterator it = m_mIndexToObject.find(index); + typename std::map::const_iterator it = m_mIndexToObject.find(index); if (it == m_mIndexToObject.end()) return ""; const T* pObject = it->second; @@ -277,8 +277,8 @@ std::string CAstraObjectManager::info() { std::stringstream res; res << "id init description" << std::endl; res << "-----------------------------------------" << std::endl; - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { - res << getInfo(it->first) << endl; + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + res << getInfo(it->first) << std::endl; } res << "-----------------------------------------" << std::endl; return res.str(); -- cgit v1.2.3