[Getfem-commits] r5335 - in /trunk/getfem/src: getfem/getfem_models.h getfem_contact_and_friction_common.cc

[logari81]

Author: logari81
Date: Mon Jun 20 22:05:59 2016
New Revision: 5335

URL: http://svn.gna.org/viewcvs/getfem?rev=5335&view=rev
Log:
fix a bug and prevent implicit casts from bool to getfem::model

Modified:
    trunk/getfem/src/getfem/getfem_models.h
    trunk/getfem/src/getfem_contact_and_friction_common.cc

Modified: trunk/getfem/src/getfem/getfem_models.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_models.h?rev=5335&r1=5334&r2=5335&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_models.h     (original)
+++ trunk/getfem/src/getfem/getfem_models.h     Mon Jun 20 22:05:59 2016
@@ -1117,7 +1117,7 @@
 
     virtual void clear();
 
-    model(bool comp_version = false);
+    explicit model(bool comp_version = false);
 
     /** check consistency of RHS and Stiffness matrix for brick with
         @param  ind_brick  - index of the brick

Modified: trunk/getfem/src/getfem_contact_and_friction_common.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_contact_and_friction_common.cc?rev=5335&r1=5334&r2=5335&view=diff
==============================================================================
--- trunk/getfem/src/getfem_contact_and_friction_common.cc      (original)
+++ trunk/getfem/src/getfem_contact_and_friction_common.cc      Mon Jun 20 
22:05:59 2016
@@ -1330,9 +1330,9 @@
 
       void compile() const {
         if (md)
-          f = ga_function(md, expr);
+          f = ga_function(*md, expr);
         else if (parent_workspace)
-          f = ga_function(parent_workspace, expr);
+          f = ga_function(*parent_workspace, expr);
         else
           f = ga_function(expr);
         size_type N = gmm::vect_size(X);