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

prefixed all macros with "CGAL_"

This commit is contained in:
Andreas Meyer 2006-12-12 10:38:56 +00:00
parent 9b1acd8b1c
commit 78dc1b39a2
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
View File

@ -37,7 +37,7 @@ CGAL_BEGIN_NAMESPACE
namespace Box_intersection_d { namespace Box_intersection_d {
#define BOX_INTERSECTION_DEBUG 0 #define CGAL_BOX_INTERSECTION_DEBUG 0
template< class ForwardIter1, class ForwardIter2, template< class ForwardIter1, class ForwardIter2,
@ -241,7 +241,7 @@ split_points( RandomAccessIter begin, RandomAccessIter end,
} }
#if BOX_INTERSECTION_DEBUG #if CGAL_BOX_INTERSECTION_DEBUG
static int level = -1; static int level = -1;
#define CGAL_BOX_INTERSECTION_DUMP(msg) { \ #define CGAL_BOX_INTERSECTION_DUMP(msg) { \
for( unsigned int i = level; i; --i ) \ for( unsigned int i = level; i; --i ) \
@ -305,7 +305,7 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
const T inf = box_limits< T >::inf(); const T inf = box_limits< T >::inf();
const T sup = box_limits< T >::sup(); const T sup = box_limits< T >::sup();
#if BOX_INTERSECTION_DEBUG #if CGAL_BOX_INTERSECTION_DEBUG
Counter<int> bla( level ); Counter<int> bla( level );
CGAL_BOX_INTERSECTION_DUMP("range: [" << lo << "," << hi << ") dim " CGAL_BOX_INTERSECTION_DUMP("range: [" << lo << "," << hi << ") dim "
<< dim << std::endl ) << dim << std::endl )
@ -317,7 +317,7 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
dump_points( p_begin, p_end, traits, dim ); dump_points( p_begin, p_end, traits, dim );
#endif #endif
#if SEGMENT_TREE_CHECK_INVARIANTS #if CGAL_SEGMENT_TREE_CHECK_INVARIANTS
{ {
// first: each point is inside segment [lo,hi) // first: each point is inside segment [lo,hi)
for( RandomAccessIter1 it = p_begin; it != p_end; ++it ) { for( RandomAccessIter1 it = p_begin; it != p_end; ++it ) {
@ -390,7 +390,10 @@ void segment_tree( RandomAccessIter1 p_begin, RandomAccessIter1 p_end,
callback, traits, cutoff, dim, in_order ); callback, traits, cutoff, dim, in_order );
} }
#undef BOX_INTERSECTION_DEBUG #if CGAL_BOX_INTERSECTION_DEBUG
#undef CGAL_BOX_INTERSECTION_DUMP
#endif
#undef CGAL_BOX_INTERSECTION_DEBUG
} // end namespace Box_intersection_d } // end namespace Box_intersection_d

2
Box_intersection_d/test/Box_intersection_d/automated_test.C
View File

@ -19,7 +19,7 @@
// Andreas Meyer <ameyer@mpi-sb.mpg.de> // Andreas Meyer <ameyer@mpi-sb.mpg.de>
// enable invariant checking // enable invariant checking
#define SEGMENT_TREE_CHECK_INVARIANTS 1 #define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
#include <CGAL/box_intersection_d.h> #include <CGAL/box_intersection_d.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>

2
Box_intersection_d/test/Box_intersection_d/benchmark.C
View File

@ -20,7 +20,7 @@
// enable invariant checking // enable invariant checking
#define SEGMENT_TREE_CHECK_INVARIANTS 1 #define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
#include <CGAL/box_intersection_d.h> #include <CGAL/box_intersection_d.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#include <iostream> #include <iostream>

2
Box_intersection_d/test/Box_intersection_d/random_set_test.C
View File

@ -20,7 +20,7 @@
// enable invariant checking // enable invariant checking
#define SEGMENT_TREE_CHECK_INVARIANTS 1 #define CGAL_SEGMENT_TREE_CHECK_INVARIANTS 1
#include <CGAL/box_intersection_d.h> #include <CGAL/box_intersection_d.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>

4
Box_intersection_d/test/Box_intersection_d/util.h
View File

@ -1,5 +1,5 @@
#ifndef BOX_INTERSECTION_D_UTIL_H #ifndef CGAL_BOX_INTERSECTION_D_UTIL_H
#define BOX_INTERSECTION_D_UTIL_H #define CGAL_BOX_INTERSECTION_D_UTIL_H
#include <vector> #include <vector>
#include <algorithm> // for pair #include <algorithm> // for pair