[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 30db1aa74c98148566f80b6425160507714494de
Author: Yves Renard <address@hidden>
Date:   Fri May 17 09:40:03 2019 +0200

    minor fixes
---
 src/getfem/getfem_interpolation.h | 8 ++++----
 src/getfem_import.cc              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/getfem/getfem_interpolation.h 
b/src/getfem/getfem_interpolation.h
index ece954b..8dadccd 100644
--- a/src/getfem/getfem_interpolation.h
+++ b/src/getfem/getfem_interpolation.h
@@ -713,10 +713,10 @@ namespace getfem {
             mf_source, mf_target, U, V_thrd, M, 0, extrapolation, EPS,
             rg_source, rg_target);
       )
-      for (size_type thread = 0; thread != V_distributed.num_threads(); 
++thread){
-        auto &V_thrd = V_distributed(thread);
-        for (size_type i = 0; i < V_thrd.size(); ++i) {
-          if (gmm::abs(V_thrd[i]) > EPS) V[i] = V_thrd[i];
+      for (size_type thread=0; thread != V_distributed.num_threads(); 
++thread){
+        auto &V_thrd2 = V_distributed(thread);
+        for (size_type i = 0; i < V_thrd2.size(); ++i) {
+          if (gmm::abs(V_thrd2[i]) > EPS) V[i] = V_thrd2[i];
         }
       }
       if (partitioning_allowed) rg_source.allow_partitioning();
diff --git a/src/getfem_import.cc b/src/getfem_import.cc
index d423f0d..729506b 100644
--- a/src/getfem_import.cc
+++ b/src/getfem_import.cc
@@ -788,7 +788,7 @@ namespace getfem {
         type_name = line.substr(pos, pos2-pos);
         bool only_digits
           = (type_name.find_first_not_of("0123456789") == std::string::npos);
-        for (auto&& c : type_name) c = std::toupper(c);
+        for (auto&& c : type_name) c = char(std::toupper(c));
 
         if (elt_types.size() < itype+1)
           elt_types.resize(itype+1);