Changeset 12330 for issm/trunk/src/c/objects/Bamg/BamgOpts.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/Bamg/BamgOpts.h (modified) (2 diffs)

issm/trunk/src/c/objects/Bamg/BamgOpts.h

@@ -5 +5 @@
 #ifndef _BAMGOPTS_H_
 #define _BAMGOPTS_H_
-
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include <mex.h>
-#endif
 
 class BamgOpts{
@@ -54 +50 @@
 
                 BamgOpts();
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                BamgOpts(mxArray* matlab_struct);
-                #endif
                 ~BamgOpts();