diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /include/astra/AstraObjectManager.h | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'include/astra/AstraObjectManager.h')
| -rw-r--r-- | include/astra/AstraObjectManager.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 9faecbe..579ff27 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_ASTRAOBJECTMANAGER @@ -195,7 +194,7 @@ int CAstraObjectManager<T>::store(T* _pDataObject) template <typename T> bool CAstraObjectManager<T>::hasIndex(int _iIndex) const { - typename map<int,T*>::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map<int,T*>::const_iterator it = m_mIndexToObject.find(_iIndex); return it != m_mIndexToObject.end(); } @@ -204,7 +203,7 @@ bool CAstraObjectManager<T>::hasIndex(int _iIndex) const template <typename T> T* CAstraObjectManager<T>::get(int _iIndex) const { - typename map<int,T*>::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map<int,T*>::const_iterator it = m_mIndexToObject.find(_iIndex); if (it != m_mIndexToObject.end()) return it->second; else @@ -217,7 +216,7 @@ template <typename T> void CAstraObjectManager<T>::remove(int _iIndex) { // find data - typename map<int,T*>::iterator it = m_mIndexToObject.find(_iIndex); + typename std::map<int,T*>::iterator it = m_mIndexToObject.find(_iIndex); if (it == m_mIndexToObject.end()) return; // delete data @@ -233,7 +232,7 @@ void CAstraObjectManager<T>::remove(int _iIndex) template <typename T> int CAstraObjectManager<T>::getIndex(const T* _pObject) const { - for (typename map<int,T*>::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map<int,T*>::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { if ((*it).second == _pObject) return (*it).first; } return 0; @@ -245,7 +244,7 @@ int CAstraObjectManager<T>::getIndex(const T* _pObject) const template <typename T> void CAstraObjectManager<T>::clear() { - for (typename map<int,T*>::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map<int,T*>::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { // delete data delete (*it).second; (*it).second = 0; @@ -258,7 +257,7 @@ void CAstraObjectManager<T>::clear() // Print info to string template <typename T> std::string CAstraObjectManager<T>::getInfo(int index) const { - typename map<int,T*>::const_iterator it = m_mIndexToObject.find(index); + typename std::map<int,T*>::const_iterator it = m_mIndexToObject.find(index); if (it == m_mIndexToObject.end()) return ""; const T* pObject = it->second; @@ -278,8 +277,8 @@ std::string CAstraObjectManager<T>::info() { std::stringstream res; res << "id init description" << std::endl; res << "-----------------------------------------" << std::endl; - for (typename map<int,T*>::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { - res << getInfo(it->first) << endl; + for (typename std::map<int,T*>::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + res << getInfo(it->first) << std::endl; } res << "-----------------------------------------" << std::endl; return res.str(); |