[Getfem-commits] r4654 - in /trunk/getfem/src: getfem/getfem_torus.h getfem_torus.cc

[Yves . Renard]

Author: renard
Date: Thu May 15 13:13:36 2014
New Revision: 4654

URL: http://svn.gna.org/viewcvs/getfem?rev=4654&view=rev
Log:
minor fixes

Modified:
    trunk/getfem/src/getfem/getfem_torus.h
    trunk/getfem/src/getfem_torus.cc

Modified: trunk/getfem/src/getfem/getfem_torus.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_torus.h?rev=4654&r1=4653&r2=4654&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_torus.h      (original)
+++ trunk/getfem/src/getfem/getfem_torus.h      Thu May 15 13:13:36 2014
@@ -90,7 +90,7 @@
     void real_hess_base_value(const fem_interpolation_context&,
       base_tensor &, bool = true) const;
 
-    torus_fem(pfem pfem) : virtual_fem(*pfem), poriginal_fem_(pfem)
+    torus_fem(pfem pf) : virtual_fem(*pf), poriginal_fem_(pf)
     {
       init();
     }
@@ -125,4 +125,4 @@
   };
 }
 
-#endif /* GETFEM_TORUS_H__  */
+#endif /* GETFEM_TORUS_H__  */

Modified: trunk/getfem/src/getfem_torus.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_torus.cc?rev=4654&r1=4653&r2=4654&view=diff
==============================================================================
--- trunk/getfem/src/getfem_torus.cc    (original)
+++ trunk/getfem/src/getfem_torus.cc    Thu May 15 13:13:36 2014
@@ -275,23 +275,23 @@
   static bgeot::size_type key_count = 0;
   DAL_SIMPLE_KEY(torus_fem_key, bgeot::size_type);
 
-  getfem::pfem new_torus_fem(getfem::pfem pfem){
+  getfem::pfem new_torus_fem(getfem::pfem pf){
     ++key_count;
-    getfem::pfem pfem_torus= new torus_fem(pfem);
+    getfem::pfem pfem_torus= new torus_fem(pf);
     dal::add_stored_object(new torus_fem_key(key_count), pfem_torus);
     return pfem_torus;
   }
 
   void del_torus_fem(getfem::pfem pfem){    
     const torus_fem *ptorus_fem = dynamic_cast<const torus_fem*>(pfem.get());
-    if(ptorus_fem != nullptr) dal::del_stored_object(pfem);
+    if (ptorus_fem != 0) dal::del_stored_object(pfem);
   }
 
   void torus_mesh_fem::adapt_to_torus(){
 
     for (dal::bv_visitor cv(linked_mesh().convex_index()); !cv.finished(); 
++cv){
       pfem poriginal_fem = fem_of_element(cv);
-      if(poriginal_fem == nullptr) continue;
+      if(poriginal_fem == 0) continue;
 
       del_torus_fem(poriginal_fem);