Changeset 11861 for issm/trunk-jpl/src/c/objects/Params/Param.h

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/Param.h (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Params/Param.h

@@ -16 +16 @@
 #endif
 
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include <mex.h>
 #endif
@@ -60 +60 @@
                 virtual void  UnitConversion(int direction_enum)=0;
                 virtual void  GetParameterName(char**pname)=0;
-                #ifdef _SERIAL_
+                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
                 virtual void  SetMatlabField(mxArray* dataref)=0;
                 #endif