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/Algorithm.h | 2 +- include/astra/ArtAlgorithm.h | 2 +- include/astra/AstraObjectManager.h | 16 +++---- include/astra/BackProjectionAlgorithm.h | 2 +- include/astra/CglsAlgorithm.h | 2 +- include/astra/CudaBackProjectionAlgorithm3D.h | 2 +- include/astra/CudaCglsAlgorithm3D.h | 2 +- include/astra/CudaDartMaskAlgorithm.h | 2 +- include/astra/CudaDartMaskAlgorithm3D.h | 2 +- include/astra/CudaDartSmoothingAlgorithm.h | 2 +- include/astra/CudaDartSmoothingAlgorithm3D.h | 2 +- include/astra/CudaDataOperationAlgorithm.h | 8 ++-- include/astra/CudaFDKAlgorithm3D.h | 2 +- include/astra/CudaForwardProjectionAlgorithm.h | 2 +- include/astra/CudaForwardProjectionAlgorithm3D.h | 2 +- include/astra/CudaReconstructionAlgorithm2D.h | 2 +- include/astra/CudaRoiSelectAlgorithm.h | 2 +- include/astra/CudaSirtAlgorithm3D.h | 2 +- include/astra/FilteredBackProjectionAlgorithm.h | 2 +- include/astra/ForwardProjectionAlgorithm.h | 2 +- include/astra/Globals.h | 4 +- include/astra/ReconstructionAlgorithm2D.h | 2 +- include/astra/ReconstructionAlgorithm3D.h | 2 +- include/astra/SartAlgorithm.h | 2 +- include/astra/SirtAlgorithm.h | 2 +- include/astra/TypeList.h | 4 +- include/astra/XMLDocument.h | 8 ++-- include/astra/XMLNode.h | 56 ++++++++++++------------ matlab/mex/mexHelpFunctions.h | 4 +- 29 files changed, 70 insertions(+), 74 deletions(-) diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 2273a83..b0d046f 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -61,7 +61,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index 697456a..73f63e3 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.h @@ -149,7 +149,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 97fde40..579ff27 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -194,7 +194,7 @@ int CAstraObjectManager::store(T* _pDataObject) template bool CAstraObjectManager::hasIndex(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); return it != m_mIndexToObject.end(); } @@ -203,7 +203,7 @@ bool CAstraObjectManager::hasIndex(int _iIndex) const template T* CAstraObjectManager::get(int _iIndex) const { - typename map::const_iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::const_iterator it = m_mIndexToObject.find(_iIndex); if (it != m_mIndexToObject.end()) return it->second; else @@ -216,7 +216,7 @@ template void CAstraObjectManager::remove(int _iIndex) { // find data - typename map::iterator it = m_mIndexToObject.find(_iIndex); + typename std::map::iterator it = m_mIndexToObject.find(_iIndex); if (it == m_mIndexToObject.end()) return; // delete data @@ -232,7 +232,7 @@ void CAstraObjectManager::remove(int _iIndex) template int CAstraObjectManager::getIndex(const T* _pObject) const { - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { if ((*it).second == _pObject) return (*it).first; } return 0; @@ -244,7 +244,7 @@ int CAstraObjectManager::getIndex(const T* _pObject) const template void CAstraObjectManager::clear() { - for (typename map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + for (typename std::map::iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { // delete data delete (*it).second; (*it).second = 0; @@ -257,7 +257,7 @@ void CAstraObjectManager::clear() // Print info to string template std::string CAstraObjectManager::getInfo(int index) const { - typename map::const_iterator it = m_mIndexToObject.find(index); + typename std::map::const_iterator it = m_mIndexToObject.find(index); if (it == m_mIndexToObject.end()) return ""; const T* pObject = it->second; @@ -277,8 +277,8 @@ std::string CAstraObjectManager::info() { std::stringstream res; res << "id init description" << std::endl; res << "-----------------------------------------" << std::endl; - for (typename map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { - res << getInfo(it->first) << endl; + for (typename std::map::const_iterator it = m_mIndexToObject.begin(); it != m_mIndexToObject.end(); it++) { + res << getInfo(it->first) << std::endl; } res << "-----------------------------------------" << std::endl; return res.str(); diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index 0d53567..dd67359 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.h @@ -122,7 +122,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index c7eac73..7ce68bc 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.h @@ -149,7 +149,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 114d6f3..4bf1870 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -106,7 +106,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 650aa27..138e677 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -113,7 +113,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index 2759add..e364de7 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index 6dcd365..30ee64f 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.h @@ -72,7 +72,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index dec8b6e..019cbf9 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index 13bc7fc..9aee8ef 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.h @@ -72,7 +72,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * 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 getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * @@ -110,10 +110,10 @@ protected: CFloat32Data2D* m_pMask; - vector m_pData; - vector m_fScalar; + std::vector m_pData; + std::vector m_fScalar; - string m_sOperation; + std::string m_sOperation; }; diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 1c4c622..1189651 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -118,7 +118,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 01661b1..95b3312 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -103,7 +103,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 9dc889e..366e1f6 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -80,7 +80,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * 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. * diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 1b3f17f..bd46ddf 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.h @@ -76,7 +76,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index a0b8794..cfc5db2 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -127,7 +127,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index 020c341..6545e7f 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.h @@ -117,7 +117,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index cd7a879..02e8894 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.h @@ -155,7 +155,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 44a77b0..8375726 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -65,9 +65,9 @@ along with the ASTRA Toolbox. If not, see . #define ASTRA_ASSERT(a) assert(a) -#define ASTRA_CONFIG_CHECK(value, type, msg) if (!(value)) { cout << "Configuration Error in " << type << ": " << msg << endl; return false; } +#define ASTRA_CONFIG_CHECK(value, type, msg) if (!(value)) { std::cout << "Configuration Error in " << type << ": " << msg << std::endl; return false; } -#define ASTRA_CONFIG_WARNING(type, msg) { cout << "Warning in " << type << ": " << msg << endl; } +#define ASTRA_CONFIG_WARNING(type, msg) { std::cout << "Warning in " << type << ": " << msg << sdt::endl; } #define ASTRA_DELETE(a) if (a) { delete a; a = NULL; } diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index 6ee7234..e105a7c 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.h @@ -116,7 +116,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 010443f..0bbae2d 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.h @@ -117,7 +117,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information. * diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index 5f39c3a..f1bd47a 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.h @@ -184,7 +184,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 70bc3cf..a4b57f8 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.h @@ -191,7 +191,7 @@ public: * * @return Map with all available identifier strings and their values. */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index 7460969..e7d7137 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.h @@ -219,10 +219,10 @@ namespace typelist { template struct functor_find { functor_find() { res = NULL; } - bool operator() (string name) { + bool operator() (std::string name) { return strcmp(tofind.c_str(), name.c_str()) == 0; } - string tofind; + std::string tofind; Base* res; }; diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index e25d398..fc8b29f 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -41,8 +41,6 @@ namespace rapidxml { #include "Globals.h" #include "XMLNode.h" -using namespace std; - namespace astra { /** This class encapsulates an XML Document of the Xerces DOM Parser. @@ -64,14 +62,14 @@ public: * @param sFilename Location of the XML file. * @return XML Document containing the DOM tree */ - static XMLDocument* readFromFile(string sFilename); + static XMLDocument* readFromFile(std::string sFilename); /** Construct an empty XML DOM tree with a specific root tag. * * @param sRootName Element name of the root tag. * @return XML Document with an empty root node */ - static XMLDocument* createDocument(string sRootName); + static XMLDocument* createDocument(std::string sRootName); /** Get the rootnode of the XML document * @@ -83,7 +81,7 @@ public: * * @param sFilename Location of the XML file. */ - void saveToFile(string sFilename); + void saveToFile(std::string sFilename); /** convert and XML DOM tree to a string */ diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 5e1908a..de5a052 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.h @@ -43,8 +43,6 @@ namespace rapidxml { #include "Globals.h" #include "Utilities.h" -using namespace std; - namespace astra { /** @@ -73,14 +71,14 @@ public: * @param _sName tagname of the requested child node * @return first child node with the correct tagname, null pointer if it doesn't exist */ - XMLNode getSingleNode(string _sName) const; + XMLNode getSingleNode(std::string _sName) const; /** Get all child XML nodes that have the tagname name * * @param _sName tagname of the requested child nodes * @return list with all child nodes with the correct tagname */ - std::list getNodes(string _sName) const; + std::list getNodes(std::string _sName) const; /** Get all child XML nodes * @@ -98,7 +96,7 @@ public: * * @return node content */ - string getContent() const; + std::string getContent() const; /** Get the content of the XML node as an integer * @@ -122,15 +120,15 @@ public: * * @return node content */ - vector getContentArray() const; + std::vector getContentArray() const; /** Get the content of the XML node as a stl container of float32 data. * NB: A 2D matrix is returned as a linear list * * @return node content */ - vector getContentNumericalArray() const; - vector getContentNumericalArrayDouble() const; + std::vector getContentNumericalArray() const; + std::vector getContentNumericalArrayDouble() const; @@ -139,7 +137,7 @@ public: * @param _sName of the attribute. * @return attribute value, empty string if it doesn't exist. */ - bool hasAttribute(string _sName) const; + bool hasAttribute(std::string _sName) const; /** Get the value of an attribute. * @@ -147,7 +145,7 @@ public: * @param _sDefaultValue value to return if the attribute isn't found * @return attribute value, _sDefaultValue if it doesn't exist. */ - string getAttribute(string _sName, string _sDefaultValue = "") const; + std::string getAttribute(std::string _sName, std::string _sDefaultValue = "") const; /** Get the value of a numerical attribute. * @@ -155,9 +153,9 @@ public: * @param _fDefaultValue value to return if the attribute isn't found * @return attribute value, _fDefaultValue if it doesn't exist. */ - float32 getAttributeNumerical(string _sName, float32 _fDefaultValue = 0) const; - double getAttributeNumericalDouble(string _sName, double _fDefaultValue = 0) const; - int getAttributeInt(string _sName, int _fDefaultValue = 0) const; + float32 getAttributeNumerical(std::string _sName, float32 _fDefaultValue = 0) const; + double getAttributeNumericalDouble(std::string _sName, double _fDefaultValue = 0) const; + int getAttributeInt(std::string _sName, int _fDefaultValue = 0) const; /** Get the value of a boolean attribute. * @@ -165,7 +163,7 @@ public: * @param _bDefaultValue value to return if the attribute isn't found * @return attribute value, _bDefaultValue if it doesn't exist. */ - bool getAttributeBool(string _sName, bool _bDefaultValue = false) const; + bool getAttributeBool(std::string _sName, bool _bDefaultValue = false) const; @@ -175,7 +173,7 @@ public: * @param _sKey option key * @return true if option does exist */ - bool hasOption(string _sKey) const; + bool hasOption(std::string _sKey) const; /** Get the value of an option within this XML Node * @@ -183,7 +181,7 @@ public: * @param _sDefaultValue value to return if key isn't found * @return option value, _sDefaultValue if the option doesn't exist */ - string getOption(string _sKey, string _sDefaultValue = "") const; + std::string getOption(std::string _sKey, std::string _sDefaultValue = "") const; /** Get the value of an option within this XML Node * @@ -191,8 +189,8 @@ public: * @param _fDefaultValue value to return if key isn't found * @return option value, _fDefaultValue if the option doesn't exist */ - float32 getOptionNumerical(string _sKey, float32 _fDefaultValue = 0) const; - int getOptionInt(string _sKey, int _fDefaultValue = 0) const; + float32 getOptionNumerical(std::string _sKey, float32 _fDefaultValue = 0) const; + int getOptionInt(std::string _sKey, int _fDefaultValue = 0) const; /** Get the value of an option within this XML Node * @@ -200,14 +198,14 @@ public: * @param _bDefaultValue value to return if key isn't found * @return option value, _bDefaultValue if the option doesn't exist */ - bool getOptionBool(string _sKey, bool _bDefaultValue = false) const; + bool getOptionBool(std::string _sKey, bool _bDefaultValue = false) const; /** Get the value of an option within this XML Node * * @param _sKey option key * @return numerical array */ - vector getOptionNumericalArray(string _sKey) const; + std::vector getOptionNumericalArray(std::string _sKey) const; @@ -218,7 +216,7 @@ public: * @param _sNodeName the name of the new childnode * @return new child node */ - XMLNode addChildNode(string _sNodeName); + XMLNode addChildNode(std::string _sNodeName); /** Create a new XML node as a child to this one, also add some content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -227,7 +225,7 @@ public: * @param _sValue some node content * @return new child node */ - XMLNode addChildNode(string _sNodeName, string _sValue); + XMLNode addChildNode(std::string _sNodeName, std::string _sValue); /** Create a new XML node as a child to this one, also add some numerical content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -236,7 +234,7 @@ public: * @param _fValue some node content * @return new child node */ - XMLNode addChildNode(string _sNodeName, float32 _fValue); + XMLNode addChildNode(std::string _sNodeName, float32 _fValue); /** Create a new XML node as a child to this one, also add a list of numerical content: * <...><_sNodeName>_sValue</_sNodeName></...> @@ -246,13 +244,13 @@ public: * @param _iSize number of elements in _pfList * @return new child node */ - XMLNode addChildNode(string _sNodeName, float32* _pfList, int _iSize); + XMLNode addChildNode(std::string _sNodeName, float32* _pfList, int _iSize); /** Add some text to the node: <...>_sText</...> * * @param _sText text to insert */ - void setContent(string _sText); + void setContent(std::string _sText); /** Add a number to the node: <...>_sText</...> * @@ -297,28 +295,28 @@ public: * @param _sName name of the attribute * @param _sValue value of the attribute */ - void addAttribute(string _sName, string _sValue); + void addAttribute(std::string _sName, std::string _sValue); /** Add an attribute with numerical data to this node: <... _sName="_fValue"> * * @param _sName name of the attribute * @param _sValue value of the attribute */ - void addAttribute(string _sName, float32 _fValue); + void addAttribute(std::string _sName, float32 _fValue); /** Add an option node as a child: <Option key="<_sKey>" value="<_sValue>"/> * * @param _sKey option key * @param _sValue option value */ - void addOption(string _sKey, string _sValue); + void addOption(std::string _sKey, std::string _sValue); /** Add an option node as a child: <Option key="<_sKey>" value="<_sValue>"/> * * @param _sKey option key * @param _sValue option value */ - void addOption(string _sKey, float32 _fValue); + void addOption(std::string _sKey, float32 _fValue); /** Print to String diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index 9b564c5..37ca894 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -46,7 +46,7 @@ along with the ASTRA Toolbox. If not, see . #include "astra/XMLNode.h" // utility functions -string mexToString(const mxArray* pInput); +std::string mexToString(const mxArray* pInput); bool mexIsScalar(const mxArray* pInput); void get3DMatrixDims(const mxArray* x, mwSize *dims); @@ -55,7 +55,7 @@ mxArray* vectorToMxArray(std::vector mInput); mxArray* anyToMxArray(boost::any _any); // turn a MATLAB struct into a Config object -astra::Config* structToConfig(string rootname, const mxArray* pStruct); +astra::Config* structToConfig(std::string rootname, const mxArray* pStruct); bool structToXMLNode(astra::XMLNode node, const mxArray* pStruct); bool optionsToXMLNode(astra::XMLNode node, const mxArray* pOptionStruct); std::map parseStruct(const mxArray* pInput); -- cgit v1.2.3