From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 28 Nov 2016 15:54:07 +0100
Subject: Update headers (website+2016)

---
 include/astra/AstraObjectManager.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include/astra/AstraObjectManager.h')

diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h
index 9faecbe..97fde40 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
-- 
cgit v1.2.3


From 27e23f29f368e06315f2ea381ef38a3affa93c64 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
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<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();
 }
 
@@ -203,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
@@ -216,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
@@ -232,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;
@@ -244,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;
@@ -257,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;
@@ -277,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();
-- 
cgit v1.2.3