[SCM] Packaging for getfem++ branch, experimental, updated. debian/4.1.1-10-9-g19c74e6

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit e3eace3dba42b1f7fa314b68ce1e9df2c85ab41c
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Nov 4 13:36:00 2012 +0100

    Fix definition order of mumps_error_check.

diff --git a/debian/patches/fix_mumps_error.patch b/debian/patches/fix_mumps_error.patch
new file mode 100644
index 0000000..4f61c2a
--- /dev/null
+++ b/debian/patches/fix_mumps_error.patch
@@ -0,0 +1,72 @@
+Description: Fix definition order of mumps_error_check.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-11-04
+
+--- a/src/gmm/gmm_MUMPS_interface.h
++++ b/src/gmm/gmm_MUMPS_interface.h
+@@ -130,6 +130,32 @@
+   };
+ 
+ 
++  template <typename MUMPS_STRUCT>
++  static inline bool mumps_error_check(MUMPS_STRUCT &id) {
++#define INFO(I) info[(I)-1]
++    if (id.INFO(1) < 0) {
++      switch (id.INFO(1)) {
++        case -2:
++          GMM_ASSERT1(false, "Solve with MUMPS failed: NZ = " << id.INFO(2)
++                      << " is out of range");
++        case -6 : case -10 :
++          GMM_WARNING1("Solve with MUMPS failed: matrix is singular");
++          return false;
++        case -9:
++          GMM_ASSERT1(false, "Solve with MUMPS failed: error "
++                      << id.INFO(1) << ", increase ICNTL(14)");
++        case -13 :
++          GMM_ASSERT1(false, "Solve with MUMPS failed: not enough memory");
++        default :
++          GMM_ASSERT1(false, "Solve with MUMPS failed with error "
++                      << id.INFO(1));
++      }
++    }
++    return true;
++#undef INFO
++  }
++
++
+   /** MUMPS solve interface  
+    *  Works only with sparse or skyline matrices
+    */
+@@ -280,32 +306,6 @@
+   }
+ 
+ 
+-  template <typename MUMPS_STRUCT>
+-  static inline bool mumps_error_check(MUMPS_STRUCT &id) {
+-#define INFO(I) info[(I)-1]
+-    if (id.INFO(1) < 0) {
+-      switch (id.INFO(1)) {
+-        case -2:
+-          GMM_ASSERT1(false, "Solve with MUMPS failed: NZ = " << id.INFO(2)
+-                      << " is out of range");
+-        case -6 : case -10 :
+-          GMM_WARNING1("Solve with MUMPS failed: matrix is singular");
+-          return false;
+-        case -9:
+-          GMM_ASSERT1(false, "Solve with MUMPS failed: error "
+-                      << id.INFO(1) << ", increase ICNTL(14)");
+-        case -13 :
+-          GMM_ASSERT1(false, "Solve with MUMPS failed: not enough memory");
+-        default :
+-          GMM_ASSERT1(false, "Solve with MUMPS failed with error "
+-                      << id.INFO(1));
+-      }
+-    }
+-    return true;
+-#undef INFO
+-  }
+-
+-
+ }
+ 
+   
diff --git a/debian/patches/series b/debian/patches/series
index 691ef81..ebc704b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disableXaccess.diff
 addgetfempath.diff
 ld-no-add-needed.patch
+fix_mumps_error.patch

-- 
Packaging for getfem++