From b483804b0f7777046fc198793f4037b9a9cb080d Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 23 Nov 2016 18:15:51 +0100 Subject: Change order of template instantiations for clang At least Apple's clang-703.0.31 needs this. --- src/AstraObjectFactory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/AstraObjectFactory.cpp') diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 35132d0..1dda3b2 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -32,8 +32,8 @@ using namespace std; namespace astra { -DEFINE_SINGLETON2(CAstraObjectFactory); -DEFINE_SINGLETON2(CAstraObjectFactory); -DEFINE_SINGLETON2(CAstraObjectFactory); +DEFINE_SINGLETON2(CAstraObjectFactory) +DEFINE_SINGLETON2(CAstraObjectFactory) +DEFINE_SINGLETON2(CAstraObjectFactory) } // end namespace -- cgit v1.2.3 From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:54:07 +0100 Subject: Update headers (website+2016) --- src/AstraObjectFactory.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/AstraObjectFactory.cpp') diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 1dda3b2..0e09d05 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -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 . ----------------------------------------------------------------------- -$Id$ */ #include "astra/AstraObjectFactory.h" -- cgit v1.2.3