songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable NEF trace unless the user specifically wants it

This commit is contained in:
Giles Bathgate 2020-12-05 08:12:56 +00:00
parent 0dcff365d0
commit ce7d06d5f4
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Nef_2/include/CGAL/Nef_2/debug.h
View File

@ -16,15 +16,14 @@
#include <iostream>
#ifdef NDEBUG
#undef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 1
#undef CGAL_USE_TRACE
#endif
#ifndef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 1
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
static int debugthread=1;
#endif
@ -35,40 +34,40 @@
#undef CGAL_NEF_CTRACEN
#undef CGAL_NEF_SETDTHREAD
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_SETDTHREAD(l) debugthread=l
#else
#define CGAL_NEF_SETDTHREAD(l)
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_TRACE(t) if((debugthread%CGAL_NEF_DEBUG)==0) \
{ std::cerr<<" "<<t; }
#else
#define CGAL_NEF_TRACE(t) (static_cast<void>(0))
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_TRACEV(t) if((debugthread%CGAL_NEF_DEBUG)==0) \
{ std::cerr<<" "<<#t<<" = "<<(t)<<std::endl; }
#else
#define CGAL_NEF_TRACEV(t) (static_cast<void>(0))
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_TRACEN(t) if((debugthread%CGAL_NEF_DEBUG)==0) \
{ std::cerr<< " "<<t<<std::endl; }
#else
#define CGAL_NEF_TRACEN(t) (static_cast<void>(0))
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_CTRACE(b,t) if(b) {std::cerr<<" "<<t;} else {std::cerr<<" 0"}
#else
#define CGAL_NEF_CTRACE(b,t) (static_cast<void>(0))
#endif
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
#define CGAL_NEF_CTRACEN(b,t) if(b){ std::cerr<<" "<<t<<"\n";} else {std::cerr<<" 0\n"}
#else
#define CGAL_NEF_CTRACEN(b,t) (static_cast<void>(0))

23
Nef_3/include/CGAL/Nef_3/K3_tree.h
View File

@ -524,19 +524,18 @@ else {
Segment_3 s = S.front().second;
S.pop_front();
if( n->is_leaf()) {
#ifndef NDEBUG
CGAL_assertion_code(
if( first_segment) {
first_segment = false;
CGAL_NEF_TRACEN("operator++: prev_segment=(none), segment="<<s);
}
else {
CGAL_assertion( prev_segment.target() == s.source());
CGAL_assertion( prev_segment.direction() == s.direction());
CGAL_NEF_TRACEN("operator++: prev_segment="<<prev_segment<<", segment="<<s);
}
prev_segment = s);
#endif
if( first_segment) {
first_segment = false;
CGAL_NEF_TRACEN("operator++: prev_segment=(none), segment="<<s);
} else {
CGAL_assertion( prev_segment.target() == s.source());
CGAL_assertion( prev_segment.direction() == s.direction());
CGAL_NEF_TRACEN("operator++: prev_segment="<<prev_segment<<", segment="<<s);
}
prev_segment = s);
node = n;
break;
}

2
Nef_3/include/CGAL/Nef_3/SNC_external_structure.h
View File

@ -660,7 +660,7 @@ public:
cet->source()->twin() == ce->source() )
break;
#ifndef NDEBUG
#ifdef CGAL_USE_TRACE
if( cet->circle() != ce->circle().opposite() )
CGAL_NEF_TRACEN("assertion failed!");