[Getfem-commits] [getfem-commits] branch master updated: preparing for 5.4 release, further fixes

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 4d89e07  preparing for 5.4 release, further fixes
     new 8f01b04  Merge branch 'master' of ssh://git.sv.gnu.org:/srv/git/getfem
4d89e07 is described below

commit 4d89e0757fd4d0fd009c27fe15b2017b20d11a98
Author: Yves Renard <address@hidden>
AuthorDate: Mon Apr 20 07:49:57 2020 +0200

    preparing for 5.4 release, further fixes
---
 doc/doxygen/Doxyfile                 | 2 +-
 interface/src/python/getfem_python.c | 2 +-
 src/gmm/gmm_real_part.h              | 4 ++++
 src/gmm/gmm_sub_vector.h             | 7 +++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index e5766f3..ca9f3a4 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = GetFEM
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 5.3
+PROJECT_NUMBER         = 5.4
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/interface/src/python/getfem_python.c 
b/interface/src/python/getfem_python.c
index 924b931..b0020ff 100644
--- a/interface/src/python/getfem_python.c
+++ b/interface/src/python/getfem_python.c
@@ -778,7 +778,7 @@ getfem_env(PyObject *self, PyObject *args) {
     word_out = PyString_FromString("GetFEM");
   } else if (strcmp(word_in,"copyright") == 0) {
     word_out = PyString_FromString
-    ("2004-2018 GetFEM project");
+    ("2004-2020 GetFEM project");
   } else if (strcmp(word_in,"authors") == 0) {
     word_out = PyString_FromString
     ("Yves Renard, Julien Pommier, Konstantinos Poulios");
diff --git a/src/gmm/gmm_real_part.h b/src/gmm/gmm_real_part.h
index 697ade1..0ea6d4d 100644
--- a/src/gmm/gmm_real_part.h
+++ b/src/gmm/gmm_real_part.h
@@ -138,6 +138,10 @@ namespace gmm {
     
     part_vector_iterator(void) {}
     explicit part_vector_iterator(const IT &i) : it(i) {}
+    part_vector_iterator(const part_vector_iterator<MIT, MIT, PART> &i)
+      : it(i.it) {}
+    part_vector_iterator &operator =
+    (const part_vector_iterator<MIT, MIT, PART> &i) { it = i.it; return *this; 
}
 
     size_type index(void) const { return it.index(); }
     part_vector_iterator operator ++(int)
diff --git a/src/gmm/gmm_sub_vector.h b/src/gmm/gmm_sub_vector.h
index 5a7902c..2ca8df8 100644
--- a/src/gmm/gmm_sub_vector.h
+++ b/src/gmm/gmm_sub_vector.h
@@ -79,6 +79,13 @@ namespace gmm {
     sparse_sub_vector_iterator(void) {}
     sparse_sub_vector_iterator(const IT &it, const IT &ite, const SUBI &s)
       : itb(it), itbe(ite), si(s) { forward(); }
+    sparse_sub_vector_iterator
+    (const sparse_sub_vector_iterator<MIT, MIT, SUBI> &it)
+      : itb(it.itb), itbe(it.itbe), si(it.si) {}
+    sparse_sub_vector_iterator &operator =
+    (const sparse_sub_vector_iterator<MIT, MIT, SUBI> &it)
+    { itb = it.itb; itbe = it.itbe;  si = it.si; return *this; }
+
   };
 
   template <typename IT, typename MIT, typename SUBI>