Changeset 12330 for issm/trunk/src/c/objects/Params/FileParam.h

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/objects/Params/FileParam.h (modified) (3 diffs)

issm/trunk/src/c/objects/Params/FileParam.h

@@ -13 +13 @@
 #else
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include <mex.h>
 #endif
 
@@ -41 +37 @@
                 int   Id(); 
                 int   MyRank();
-                #ifdef _SERIAL_
-                void  Marshall(char** pmarshalled_dataset);
-                int   MarshallSize();
-                void  Demarshall(char** pmarshalled_dataset);
-                #endif
                 int   ObjectEnum();
                 Object* copy();
@@ -81 +72 @@
 
                 void GetParameterName(char**pname);
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                void  SetMatlabField(mxArray* dataref);
-                #endif
 
                 /*}}}*/