Changeset 12168 for issm/branches/trunk-jpl-damage/src/c/objects/Numerics/Vector.h

Timestamp:

05/01/12 17:28:47 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into branch through revision 12167

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/c/objects/Numerics/Vector.h (modified) (3 diffs)

issm/branches/trunk-jpl-damage

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in
 stamp-h1
 svn-commit*
-nightlylog

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in
 stamp-h1
 svn-commit*
-nightlylog

issm/branches/trunk-jpl-damage/src/c/objects/Numerics/Vector.h

@@ -21 +21 @@
 #endif
                 
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include "mex.h"
-#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_

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in
 stamp-h1
 svn-commit*
-nightlylog