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

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

diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h
index 31f0ff5..37391fb 100644
--- a/include/astra/CudaDataOperationAlgorithm.h
+++ b/include/astra/CudaDataOperationAlgorithm.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_CUDADATAOPERATIONALGORITHM
-- 
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/CudaDataOperationAlgorithm.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h
index 37391fb..79c5bd6 100644
--- a/include/astra/CudaDataOperationAlgorithm.h
+++ b/include/astra/CudaDataOperationAlgorithm.h
@@ -75,7 +75,7 @@ public:
 	 *
 	 * @return map with all boost::any object
 	 */
-	virtual map<string,boost::any> getInformation();
+	virtual std::map<std::string,boost::any> getInformation();
 
 	/** Get a single piece of information represented as a boost::any
 	 *
@@ -110,10 +110,10 @@ protected:
 
 	CFloat32Data2D* m_pMask;
 
-	vector<CFloat32Data2D*> m_pData;
-	vector<float> m_fScalar;
+	std::vector<CFloat32Data2D*> m_pData;
+	std::vector<float> m_fScalar;
 
-	string m_sOperation;
+	std::string m_sOperation;
 
 };
 
-- 
cgit v1.2.3