From b36a1bd18c69253b54e16bcbf7e10a27413ec22d Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 29 Nov 2019 09:14:11 +0100 Subject: [PATCH] Add mnissing --- Kernel_23/include/CGAL/Aff_transformation_3.h | 3 +++ .../CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Kernel_23/include/CGAL/Aff_transformation_3.h b/Kernel_23/include/CGAL/Aff_transformation_3.h index 499ebb0c808..7e2c1c5a69c 100644 --- a/Kernel_23/include/CGAL/Aff_transformation_3.h +++ b/Kernel_23/include/CGAL/Aff_transformation_3.h @@ -28,6 +28,9 @@ #include #include +#ifndef CGAL_NO_OSTREAM_INSERT_AFF_TRANSFORMATION_3 +#include +#endif namespace CGAL { template diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h index 2eeea15d937..44b579f0365 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h @@ -136,7 +136,7 @@ public: } ; - typedef Modifiable_priority_queue PQ ; + typedef Modifiable_priority_queue PQ; typedef typename PQ::handle pq_handle ; // An Edge_data is associated with EVERY _ edge in the mesh (collapsable or not). @@ -300,7 +300,6 @@ private: CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; aData.set_PQ_handle(mPQ->update(aEdge,aData.PQ_handle())) ; - CGAL_SURF_SIMPL_TEST_assertion(aData.is_in_PQ()); CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; } @@ -310,7 +309,7 @@ private: CGAL_SURF_SIMPL_TEST_assertion(is_primary_edge(aEdge)) ; CGAL_SURF_SIMPL_TEST_assertion(aData.is_in_PQ()); CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; - + std::cout<<"remove"<erase(aEdge,aData.PQ_handle())); CGAL_SURF_SIMPL_TEST_assertion(!aData.is_in_PQ());