finish

Author: maxGimeno

Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h

@@ -1232,17 +1232,17 @@ int
 Sliver_perturber<C3T3,Md,Sc,V_>::
 update_priority_queue(const PVertex& pv, PQueue& pqueue) const
 {
-  typename PQueue::handle cont = pqueue.contains(pv);
-  if (  cont != pqueue.end())
+  typename PQueue::handle h = pqueue.contains(pv);
+  if (  h != pqueue.end())
   {
     if ( pv.is_perturbable() )
     {
-      pqueue.update(pv, cont);
+      pqueue.update(pv, h);
       return 0;
     }
     else
     {
-      pqueue.remove(cont);
+      pqueue.remove(h);
       return -1;
     }
   }

Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h

@@ -28,6 +28,7 @@
 #include <CGAL/Polyline_simplification_2/Stop_above_cost_threshold.h>
 #include <CGAL/Modifiable_priority_queue.h>
 #include <CGAL/algorithm.h>
+#include<CGAL/assertions.h>
 
 // Needed for Polygon_2
 
@@ -36,7 +37,6 @@
 #include <CGAL/Constrained_triangulation_plus_2.h>
 #include <list>
 
-
 namespace CGAL {
 
 #ifndef DOXYGEN_RUNNING
@@ -325,14 +325,14 @@ operator()()
 
     if((*u)->is_removable()){
       boost::optional<FT> dist = cost(pct, u);
+      bool found;
+      typename MPQ::handle h =mpq->contains(*u, found);
       if(! dist){
         // cost is undefined
-        if( mpq->contains(*u) ){
-          mpq->erase(*u);
+        if( found ){
+          mpq->erase(h);
         }
       } else {
-        bool found;
-        typename MPQ::handle h =mpq->contains(*u, found);
         if(found){
           (*u)->set_cost(*dist);
           mpq->update(*u, h);
@@ -345,13 +345,13 @@ operator()()
 
     if((*w)->is_removable()){
       boost::optional<FT> dist = cost(pct, w);
+      bool found;
+      typename MPQ::handle h =mpq->contains(*w, found);
       if(! dist)
         // cost is undefined
-        if( mpq->contains(*w) ){
-          mpq->erase(*w);
+        if( found){
+          mpq->erase(h);
         } else {
-          bool found;
-          typename MPQ::handle h =mpq->contains(*w, found);
           if(found){
             (*w)->set_cost(*dist);
             mpq->update(*w, h);

STL_Extension/include/CGAL/Modifiable_priority_queue.h

@@ -110,6 +110,7 @@ class Modifiable_priority_queue
 
   handle erase ( value_type const& v, handle  ) { mHeap.remove(v); return null_handle() ; }
   handle erase ( value_type const& v  ) { mHeap.remove(v); return null_handle() ; }
+  handle erase ( handle h) { mHeap.remove(h); return null_handle() ; }
 
   value_type top() const { return mHeap.top() ; }