summaryrefslogtreecommitdiffstats
path: root/matlab/mex/mexHelpFunctions.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-02-16 14:37:44 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-02-16 14:37:44 +0100
commit27e23f29f368e06315f2ea381ef38a3affa93c64 (patch)
tree0cac9c94878909bb1eff59c8d4ae3e9b815aa76e /matlab/mex/mexHelpFunctions.h
parentf591df5ff62deb8de2956cc8200db4034fb6ea05 (diff)
downloadastra-27e23f29f368e06315f2ea381ef38a3affa93c64.tar.gz
astra-27e23f29f368e06315f2ea381ef38a3affa93c64.tar.bz2
astra-27e23f29f368e06315f2ea381ef38a3affa93c64.tar.xz
astra-27e23f29f368e06315f2ea381ef38a3affa93c64.zip
Remove using namespace std; from headers
Diffstat (limited to 'matlab/mex/mexHelpFunctions.h')
-rw-r--r--matlab/mex/mexHelpFunctions.h4
1 files changed, 2 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>.
#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<astra::float32> 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<std::string, mxArray*> parseStruct(const mxArray* pInput);