Changeset 12181

Timestamp:

05/03/12 09:38:53 (13 years ago)

Author:

Mathieu Morlighem

Message:

Enable GSL and PETSc simultaneously

Location:

issm/trunk-jpl/src/c/objects/Numerics

Files:

• Vector.cpp (modified) (1 diff)
• Vector.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp ¶

@@ -85 +85 @@
 /*}}}*/
 #endif
-#ifdef _HAVE_GSL_
+#if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
 /*FUNCTION Vector::Vector(SeqVec* seq_vec){{{1*/
 Vector::Vector(SeqVec*  seq_vec){

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

@@ -43 +43 @@
                 Vector(Vec petsc_vec);
                 #endif
-                #ifdef _HAVE_GSL_
+                #if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
                 Vector(SeqVec*  seq_vec);
                 #endif