[Getfem-commits] r4639 - /trunk/getfem/src/getfem/getfem_generic_assembly.h

[andriy . andreykiv]

Author: andrico
Date: Tue May  6 16:42:45 2014
New Revision: 4639

URL: http://svn.gna.org/viewcvs/getfem?rev=4639&view=rev
Log:
renaming arguments of two methods to prevent compiler warning about variables 
being shadowed

Modified:
    trunk/getfem/src/getfem/getfem_generic_assembly.h

Modified: trunk/getfem/src/getfem/getfem_generic_assembly.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_generic_assembly.h?rev=4639&r1=4638&r2=4639&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_generic_assembly.h   (original)
+++ trunk/getfem/src/getfem/getfem_generic_assembly.h   Tue May  6 16:42:45 2014
@@ -178,8 +178,8 @@
       const model_real_sparse_matrix &operator()(void) const { return *ptr; }
       void resize(size_type nb)
       { if (todelete) { gmm::clear(*ptr); gmm::resize(*ptr, nb, nb); } }
-      void set_matrix(model_real_sparse_matrix &K)
-      { if (todelete) delete ptr; todelete = false; ptr = &K; }
+      void set_matrix(model_real_sparse_matrix &M)
+      { if (todelete) delete ptr; todelete = false; ptr = &M; }
       sparse_matrix_ptr(void):
         todelete(true), ptr(new model_real_sparse_matrix(2,2)) {}
       sparse_matrix_ptr(const sparse_matrix_ptr &smp):
@@ -201,8 +201,8 @@
       const base_vector &operator()(void) const { return *ptr; }
       void resize(size_type nb)
       { if (todelete) { gmm::clear(*ptr); gmm::resize(*ptr, nb);} }
-      void set_vector(base_vector &V)
-      { if (todelete) delete ptr; todelete = false; ptr = &V; }
+      void set_vector(base_vector &vector)
+      { if (todelete) delete ptr; todelete = false; ptr = &vector; }
       base_vector_ptr(void):
         todelete(true), ptr(new base_vector(2)) {}
       base_vector_ptr(const base_vector_ptr &smp):