[Getfem-commits] (no subject)

[Markus Bürg]

branch: mb_race_condition_convex_of_reference
commit e1d09c9593cb2f6382e5b8255d46e64fc479bb35
Author: mb <address@hidden>
Date:   Tue Sep 12 12:35:56 2017 +0200

    Don't change current cvs, since it is a const function.
---
 src/bgeot_convex_ref.cc       | 8 ++++----
 src/getfem/bgeot_convex_ref.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bgeot_convex_ref.cc b/src/bgeot_convex_ref.cc
index 1fe8e3b..41af8b4 100644
--- a/src/bgeot_convex_ref.cc
+++ b/src/bgeot_convex_ref.cc
@@ -30,16 +30,16 @@ namespace bgeot {
 
   static void simplexify_convex(pconvex_structure cvs, mesh_structure &m) {
     m.clear();
-    cvs = basic_structure(cvs);
-    dim_type n = cvs->dim();
+    auto basic_cvs = basic_structure(cvs);
+    dim_type n = basic_cvs->dim();
     std::vector<size_type> ipts(n+1);
-    if (cvs->nb_points() == n + 1) {
+    if (basic_cvs->nb_points() == n + 1) {
       for (size_type i = 0; i <= n; ++i) ipts[i] = i;
       m.add_simplex(n, ipts.begin());
     }
     else {
       size_type *tab;
-      size_type nb = simplexified_tab(cvs, &tab);
+      size_type nb = simplexified_tab(basic_cvs, &tab);
       for (size_type nc = 0; nc < nb; ++nc) {
         for (size_type i = 0; i <= n; ++i) ipts[i] = *tab++;
         m.add_simplex(n, ipts.begin());
diff --git a/src/getfem/bgeot_convex_ref.h b/src/getfem/bgeot_convex_ref.h
index 3489ab9..23d8c1c 100644
--- a/src/getfem/bgeot_convex_ref.h
+++ b/src/getfem/bgeot_convex_ref.h
@@ -93,7 +93,7 @@ namespace bgeot {
   protected :
     std::vector<base_small_vector> normals_;
     pstored_point_tab ppoints;
-    mutable std::shared_ptr<mesh_structure> psimplexified_convex;
+    std::shared_ptr<mesh_structure> psimplexified_convex;
     pconvex_ref basic_convex_ref_;
     bool auto_basic;
     convex_of_reference() : convex<base_node>(),