From bd5abc1dd5162ead6e0d19fb8f575bc61fcbc6c0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 25 Sep 2018 18:19:09 +0200 Subject: Unify USE_MATLAB_UNDOCUMENTED define --- matlab/mex/astra_mex_algorithm_c.cpp | 2 -- matlab/mex/astra_mex_data3d_c.cpp | 2 -- matlab/mex/astra_mex_direct_c.cpp | 2 -- matlab/mex/mexDataManagerHelpFunctions.cpp | 2 -- matlab/mex/mexHelpFunctions.h | 6 ++++-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index 80c0424..7804eeb 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -34,8 +34,6 @@ along with the ASTRA Toolbox. If not, see . #include "mexInitFunctions.h" #include "astra/Globals.h" -#define USE_MATLAB_UNDOCUMENTED - #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { bool utIsInterruptPending(); } diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 5504955..4642693 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -55,8 +55,6 @@ along with the ASTRA Toolbox. If not, see . using namespace std; using namespace astra; -#define USE_MATLAB_UNDOCUMENTED - //----------------------------------------------------------------------------------------- /** * id = astra_mex_io_data('create', datatype, geometry, data); diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp index 1a129f4..0090d13 100644 --- a/matlab/mex/astra_mex_direct_c.cpp +++ b/matlab/mex/astra_mex_direct_c.cpp @@ -54,8 +54,6 @@ along with the ASTRA Toolbox. If not, see . using namespace std; using namespace astra; -#define USE_MATLAB_UNDOCUMENTED - class CFloat32CustomMemory_simple : public astra::CFloat32CustomMemory { public: diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index a71928b..dc225ac 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -36,8 +36,6 @@ along with the ASTRA Toolbox. If not, see . #include "astra/Float32VolumeData3DMemory.h" #include "astra/Float32ProjectionData3DMemory.h" -#define USE_MATLAB_UNDOCUMENTED - #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index bf22929..56994dc 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -28,6 +28,10 @@ along with the ASTRA Toolbox. If not, see . #ifndef _INC_ASTRA_MEX_HELPFUNCTIONS #define _INC_ASTRA_MEX_HELPFUNCTIONS + +#define USE_MATLAB_UNDOCUMENTED + + #include #include #include @@ -66,6 +70,4 @@ mxArray* XMLNodeToStruct(astra::XMLNode xml); mxArray* stringToMxArray(std::string input); mxArray* buildStruct(std::map mInput); - - #endif -- cgit v1.2.3