Changeset 11861 for issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp

Timestamp:

04/02/12 15:44:28 (13 years ago)

Author:

Mathieu Morlighem

Message:

reverted ifdef _SERIAL_ to ifd defined(_SERIAL_) && defined(_HAVE_MATLAB_)

File:

• issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp

@@ -78 +78 @@
 }
 /*}}}*/
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 /*FUNCTION DoubleMatParam::Marshall{{{1*/
 void  DoubleMatParam::Marshall(char** pmarshalled_dataset){
@@ -169 +169 @@
 /*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/
 void  DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
         int* output=NULL;
         int  i;
@@ -191 +191 @@
 /*}}}*/
 /*FUNCTION DoubleMatParam::SetMatlabField{{{1*/
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 void  DoubleMatParam::SetMatlabField(mxArray* dataref){