Changeset 12330 for issm/trunk/src/c/objects/Numerics/Vector.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/Numerics/Vector.h (modified) (4 diffs)

issm/trunk/src/c/objects/Numerics/Vector.h

@@ -21 +21 @@
 #endif
                 
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include "mex.h"
-#endif
-
 /*}}}*/
 
@@ -47 +43 @@
                 Vector(Vec petsc_vec);
                 #endif
-                #ifdef _HAVE_GSL_
+                #if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
                 Vector(SeqVec*  seq_vec);
                 #endif
@@ -54 +50 @@
                 /*Vector specific routines {{{1*/
                 void Echo(void);
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                mxArray* ToMatlabVector(void);
-                #endif
                 void    AXPY(Vector *X, double a);
                 void    AYPX(Vector *X, double a);
@@ -77 +70 @@
 };
 
-/*API: */
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-Vector* MatlabVectorToVector(const mxArray* mxvector);
-#endif
 
 #endif //#ifndef _VECTOR_H_