diff options
Diffstat (limited to 'include/astra/CudaDataOperationAlgorithm.h')
| -rw-r--r-- | include/astra/CudaDataOperationAlgorithm.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index 31f0ff5..79c5bd6 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 @@ -76,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 * @@ -111,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; }; |