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) --- include/astra/CudaReconstructionAlgorithm2D.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include/astra/CudaReconstructionAlgorithm2D.h') diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index bb5f2a7..6852bb8 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.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 . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDARECONSTRUCTIONALGORITHM2D -- cgit v1.2.3 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/CudaReconstructionAlgorithm2D.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/astra/CudaReconstructionAlgorithm2D.h') diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index 6852bb8..f7a311a 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -86,7 +86,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * -- cgit v1.2.3