[SCM] Packaging for getfem++ branch, master, updated. upstream/4.1.1-29-g4b4d969
Anton Gladky
gladky.anton at gmail.com
Fri May 25 19:56:50 UTC 2012
The following commit has been merged in the master branch:
commit 20ac20db46a53d26537118e6cb0f9f1a538e0fe9
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Fri May 25 21:54:53 2012 +0200
Fix FTBFS with gcc-4.7
diff --git a/debian/patches/fix-gcc-4.7-ftbfs_part2.patch b/debian/patches/fix-gcc-4.7-ftbfs_part2.patch
new file mode 100644
index 0000000..228bf9e
--- /dev/null
+++ b/debian/patches/fix-gcc-4.7-ftbfs_part2.patch
@@ -0,0 +1,65 @@
+Description: fix FTBFS with gcc-4.7
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-05-25
+
+--- a/src/gmm/gmm_vector.h
++++ b/src/gmm/gmm_vector.h
+@@ -235,14 +235,14 @@
+ template<typename T> void wsvector<T>::clean(double eps) {
+ iterator it = this->begin(), itf = it, ite = this->end();
+ while (it != ite) {
+- ++itf; if (gmm::abs(it->second) <= eps) erase(it); it = itf;
++ ++itf; if (gmm::abs(it->second) <= eps) base_type::erase(it); it = itf;
+ }
+ }
+
+ template<typename T> void wsvector<T>::resize(size_type n) {
+ if (n < nbl) {
+ iterator it = this->begin(), itf = it, ite = this->end();
+- while (it != ite) { ++itf; if (it->first >= n) erase(it); it = itf; }
++ while (it != ite) { ++itf; if (it->first >= n) base_type::erase(it); it = itf; }
+ }
+ nbl = n;
+ }
+--- a/src/getfem/bgeot_tensor.h
++++ b/src/getfem/bgeot_tensor.h
+@@ -187,7 +187,7 @@
+ sizes_ = c; coeff.resize(c.size());
+ multi_index::iterator p = coeff.begin(), pe = coeff.end();
+ for ( ; p != pe; ++p, ++it) { *p = short_type(d); d *= *it; }
+- resize(d);
++ this->resize(d);
+ }
+
+ void adjust_sizes(const multi_index &mi) {
+--- a/src/getfem/getfem_modeling.h
++++ b/src/getfem/getfem_modeling.h
+@@ -863,7 +863,7 @@
+ const mesh_fem &mf_vm,
+ VECTVM &VM, bool tresca) {
+ getfem::interpolation_von_mises_or_tresca
+- (this->mf_u,mf_vm,get_solution(MS),VM,
++ (this->mf_u,mf_vm,this->get_solution(MS),VM,
+ lambda().mf(),lambda().get(),mu().mf(),mu().get(),tresca);
+ }
+ };
+--- a/src/getfem/getfem_assembling_tensors.h
++++ b/src/getfem/getfem_assembling_tensors.h
+@@ -451,7 +451,7 @@
+ if (sz == 0)
+ ASM_THROW_TENSOR_ERROR("can't create a vector of size " << r);
+ asm_vec<VEC> v(new VEC(sz));
+- push_back(v); return &this->back();
++ this->push_back(v); return &this->back();
+ }
+ ~vec_factory() {
+ for (size_type i=0; i < this->size(); ++i) {
+@@ -493,7 +493,7 @@
+ : public base_mat_factory, private std::deque<asm_mat<MAT> > {
+ public:
+ base_asm_mat* create_mat(size_type m, size_type n) {
+- push_back(asm_mat<MAT>(new MAT(m, n))); return &this->back();
++ this->push_back(asm_mat<MAT>(new MAT(m, n))); return &this->back();
+ }
+ ~mat_factory() {
+ for (size_type i=0; i < this->size(); ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index 1893d9c..50598df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disableXaccess.diff
addgetfempath.diff
ld-no-add-needed.patch
fix-gcc-4.7-ftbfs.patch
+fix-gcc-4.7-ftbfs_part2.patch
--
Packaging for getfem++
More information about the debian-science-commits
mailing list