[Getfem-commits] (no subject)

[Yves Renard]

branch: mb-transInversion
commit 1fc1f569bcf8fa804433042e9b83194f10e86446
Author: Yves Renard <address@hidden>
Date:   Thu Aug 31 14:37:11 2017 +0200

    Fix a conflict
---
 src/bgeot_geotrans_inv.cc       | 2 +-
 src/getfem/bgeot_geotrans_inv.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bgeot_geotrans_inv.cc b/src/bgeot_geotrans_inv.cc
index 22e66a1..f2fa44d 100644
--- a/src/bgeot_geotrans_inv.cc
+++ b/src/bgeot_geotrans_inv.cc
@@ -308,7 +308,7 @@ void project_into_convex(base_node &x, const 
geometric_trans *pgeo_trans, bool p
 
 void find_initial_guess(
   base_node &x,
-  nonlinear_storage &storage,
+  nonlinear_storage_struct &storage,
   const base_node &xreal,
   const base_matrix &G,
   const geometric_trans *pgt,
diff --git a/src/getfem/bgeot_geotrans_inv.h b/src/getfem/bgeot_geotrans_inv.h
index 419da48..cde04ff 100644
--- a/src/getfem/bgeot_geotrans_inv.h
+++ b/src/getfem/bgeot_geotrans_inv.h
@@ -59,7 +59,7 @@
 namespace bgeot {
   class geotrans_inv_convex;
 
-  struct nonlinear_storage {
+  struct nonlinear_storage_struct {
     base_node diff;
     base_node x_real;
     base_node x_ref;
@@ -148,7 +148,7 @@ namespace bgeot {
                       scalar_type IN_EPS, bool &converged, bool throw_except);
     void update_B();
 
-    nonlinear_storage nonlinear_storage;
+    nonlinear_storage_struct nonlinear_storage;
 
     friend class geotrans_inv_convex_bfgs;
   };