From f3f6bebe605096bd15a726cccc922323f430493a Mon Sep 17 00:00:00 2001 From: Giles Bathgate Date: Wed, 12 May 2021 07:37:49 +0100 Subject: [PATCH] Replace CGAL_NEF_DEBUG with CGAL_USE_TRACE --- Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h | 2 +- Nef_3/include/CGAL/Nef_3/Binary_operation.h | 3 +-- Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h b/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h index 696f812887e..7e4bfc619b6 100644 --- a/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h +++ b/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h @@ -39,7 +39,7 @@ #include namespace CGAL { -#ifdef CGAL_NEF_DEBUG +#ifdef CGAL_USE_TRACE #define PIS(s) (s->first()) #endif diff --git a/Nef_3/include/CGAL/Nef_3/Binary_operation.h b/Nef_3/include/CGAL/Nef_3/Binary_operation.h index 83994a2f156..cc49a960930 100644 --- a/Nef_3/include/CGAL/Nef_3/Binary_operation.h +++ b/Nef_3/include/CGAL/Nef_3/Binary_operation.h @@ -191,9 +191,8 @@ class Binary_operation : public CGAL::SNC_decorator { Halffacet_handle f; Point_3 p(normalized(ip)); - +#ifdef CGAL_USE_TRACE CGAL_NEF_TRACEN("Intersection_call_back: intersection reported on " << p << " (normalized: " << normalized(p) << " )"); -#ifdef CGAL_NEF_DEBUG CGAL_NEF_TRACEN("edge 0 has source " << e0->source()->point() << " and direction " << e0->vector()); if( CGAL::assign( e, o1)) { CGAL_NEF_TRACEN("edge 1 has source " << e->source()->point() << " and direction " << e->vector()); diff --git a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h index 802dec8bf7f..9e3d8c93cef 100644 --- a/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h +++ b/Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h @@ -323,12 +323,12 @@ public: CGAL_NEF_TRACEN("f_visible"<< f_visible->plane()); } else if(fc.is_svertex()) { -#ifdef CGAL_NEF_DEBUG +#ifdef CGAL_USE_TRACE // TODO: is there any warranty that the outter facet cycle enty point is always at first // in the cycles list? ++fc; while( fc != fce) { CGAL_assertion( fc.is_svertex()); ++fc; } -#endif CGAL_NEF_TRACEN( "no adjacent facets were found (but incident edge(s))."); +#endif f_visible = Halffacet_const_handle(); } else