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/AstraObjectFactory.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h
index 6af9cd8..eb22862 100644
--- a/include/astra/AstraObjectFactory.h
+++ b/include/astra/AstraObjectFactory.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_ASTRAOBJECTFACTORY
-- 
cgit v1.2.3


From 8de844c3521d9ee54087927923b932e1016c5b90 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 16 Feb 2017 14:47:07 +0100
Subject: Remove using namespace astra; from headers

---
 include/astra/AstraObjectFactory.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h
index eb22862..746e27a 100644
--- a/include/astra/AstraObjectFactory.h
+++ b/include/astra/AstraObjectFactory.h
@@ -117,9 +117,9 @@ T* CAstraObjectFactory<T, TypeList>::findPlugin(std::string _sType)
 template <typename T, typename TypeList>
 T* CAstraObjectFactory<T, TypeList>::create(std::string _sType) 
 {
-	functor_find<T> finder = functor_find<T>();
+	typelist::functor_find<T> finder = typelist::functor_find<T>();
 	finder.tofind = _sType;
-	CreateObject<TypeList>::find(finder);
+	typelist::CreateObject<TypeList>::find(finder);
 	if (finder.res == NULL) {
 		finder.res = findPlugin(_sType);
 	}
-- 
cgit v1.2.3