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

CGAL_NULL and CGAL_NULL_TYPE are now constant macros, so replace them by: 

- CGAL_NULL -> NULL
- CGAL_NULL_TYPE -> CGAL::Nullptr_t (typedef to const void *)
This commit is contained in:
Sylvain Pion 2008-07-12 21:58:52 +00:00
parent 32a9d86ec2
commit eff6efd3af
34 changed files with 317 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_2/include/CGAL/IO/Arrangement_2_writer.h
View File

@ -325,7 +325,7 @@ protected:
/*! Get the number of edges along a given CCB. */ /*! Get the number of edges along a given CCB. */
std::size_t _circulator_size (Ccb_halfedge_const_circulator circ) const std::size_t _circulator_size (Ccb_halfedge_const_circulator circ) const
{ {
CGAL_assertion (circ != CGAL_NULL); CGAL_assertion (circ != NULL);
std::size_t n = 0; std::size_t n = 0;
Ccb_halfedge_const_circulator curr = circ; Ccb_halfedge_const_circulator curr = circ;

6
Circulator/include/CGAL/Safe_circulator_from_iterator.h
View File

@ -93,11 +93,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return m_empty; return m_empty;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const bool operator==( const Self& c) const
{ {

58
Circulator/include/CGAL/circulator.h
View File

@ -307,7 +307,7 @@ void Assert_is_at_least_random_access_category( const IC& /*ic*/) {
template< class C> inline template< class C> inline
bool I_is_empty_range( const C& c1, const C&, Circulator_tag){ bool I_is_empty_range( const C& c1, const C&, Circulator_tag){
return c1 == CGAL_NULL; return c1 == NULL;
} }
template< class I> inline template< class I> inline
@ -364,7 +364,7 @@ I_min_circulator_size( const C& c) {
Assert_random_access_category(c); Assert_random_access_category(c);
typedef typename C::size_type size_type; typedef typename C::size_type size_type;
size_type n = 0; size_type n = 0;
if ( c != CGAL_NULL) { if ( c != NULL) {
n = (c-1) - c + 1; n = (c-1) - c + 1;
CGAL_assertion(n > 0); CGAL_assertion(n > 0);
} }
@ -375,7 +375,7 @@ template <class C>
typename C::size_type typename C::size_type
I_circulator_size( const C& c, Forward_circulator_tag) { I_circulator_size( const C& c, Forward_circulator_tag) {
// Simply count. // Simply count.
if ( c == CGAL_NULL) if ( c == NULL)
return 0; return 0;
typedef typename C::size_type size_type; typedef typename C::size_type size_type;
size_type n = 0; size_type n = 0;
@ -408,7 +408,7 @@ template <class C>
typename C::difference_type typename C::difference_type
I_circulator_distance( C c, const C& d, Forward_circulator_tag) { I_circulator_distance( C c, const C& d, Forward_circulator_tag) {
// Simply count. // Simply count.
if ( c == CGAL_NULL) if ( c == NULL)
return 0; return 0;
typedef typename C::difference_type difference_type; typedef typename C::difference_type difference_type;
difference_type n = 0; difference_type n = 0;
@ -547,18 +547,18 @@ public:
return !(*this == i); return !(*this == i);
} }
Ref operator*() const { Ref operator*() const {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
return Ref(*current); return Ref(*current);
} }
Ptr operator->() const { Ptr operator->() const {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
return Ptr(current.operator->()); return Ptr(current.operator->());
} }
Self& operator++() { Self& operator++() {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
++current; ++current;
if ( current == *m_anchor) if ( current == *m_anchor)
++m_winding; ++m_winding;
@ -570,8 +570,8 @@ public:
return tmp; return tmp;
} }
Self& operator--() { Self& operator--() {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
if ( current == *m_anchor) if ( current == *m_anchor)
--m_winding; --m_winding;
--current; --current;
@ -583,8 +583,8 @@ public:
return tmp; return tmp;
} }
Self& operator+=( difference_type n) { Self& operator+=( difference_type n) {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
if ( n < 0 && current == *m_anchor) // We are leaving the anchor. if ( n < 0 && current == *m_anchor) // We are leaving the anchor.
--m_winding; --m_winding;
current += n; current += n;
@ -604,8 +604,8 @@ public:
return tmp += -n; return tmp += -n;
} }
difference_type operator-( const Self& i) const { difference_type operator-( const Self& i) const {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
CGAL_assertion( m_anchor == i.m_anchor); CGAL_assertion( m_anchor == i.m_anchor);
if ( m_winding != i.m_winding) { if ( m_winding != i.m_winding) {
difference_type s = I_min_circulator_size( *m_anchor); difference_type s = I_min_circulator_size( *m_anchor);
@ -621,8 +621,8 @@ public:
return tmp.operator*(); return tmp.operator*();
} }
bool operator<( const Self& i) const { bool operator<( const Self& i) const {
CGAL_assertion( m_anchor != CGAL_NULL); CGAL_assertion( m_anchor != NULL);
CGAL_assertion( current != CGAL_NULL); CGAL_assertion( current != NULL);
CGAL_assertion( m_anchor == i.m_anchor); CGAL_assertion( m_anchor == i.m_anchor);
return ( (m_winding < i.m_winding) return ( (m_winding < i.m_winding)
|| ( (m_winding == i.m_winding) || ( (m_winding == i.m_winding)
@ -693,12 +693,12 @@ typedef Iterator_from_circulator< C, const_reference, const_pointer>
} }
iterator end() { iterator end() {
// the past-the-end iterator. // the past-the-end iterator.
return anchor == CGAL_NULL ? iterator( &anchor, 0) return anchor == NULL ? iterator( &anchor, 0)
: iterator( &anchor, 1); : iterator( &anchor, 1);
} }
const_iterator end() const { const_iterator end() const {
// the past-the-end const iterator. // the past-the-end const iterator.
return anchor == CGAL_NULL ? const_iterator( &anchor, 0) return anchor == NULL ? const_iterator( &anchor, 0)
: const_iterator( &anchor, 1); : const_iterator( &anchor, 1);
} }
}; };
@ -741,11 +741,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return (ctnr == NULL) || (ctnr->begin() == ctnr->end()); return (ctnr == NULL) || (ctnr->begin() == ctnr->end());
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return i == c.i; } bool operator==( const Self& c) const { return i == c.i; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { reference operator*() const {
@ -874,11 +874,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return (ctnr == NULL) || (ctnr->begin() == ctnr->end()); return (ctnr == NULL) || (ctnr->begin() == ctnr->end());
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return i == c.i; } bool operator==( const Self& c) const { return i == c.i; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { reference operator*() const {
@ -1026,11 +1026,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return empty; return empty;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return current == c.current;} bool operator==( const Self& c) const { return current == c.current;}
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { reference operator*() const {

60
Circulator/include/CGAL/circulator_impl.h
View File

@ -65,11 +65,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { return *(S*)this->_ptr;} reference operator*() const { return *(S*)this->_ptr;}
@ -108,11 +108,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { return *(const S*)this->_ptr;} reference operator*() const { return *(const S*)this->_ptr;}
@ -155,11 +155,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { return *(S*)this->_ptr;} reference operator*() const { return *(S*)this->_ptr;}
@ -207,11 +207,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { return *(const S*)this->_ptr;} reference operator*() const { return *(const S*)this->_ptr;}
@ -266,11 +266,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
C& operator*() const { return *(C*)this->_ptr;} C& operator*() const { return *(C*)this->_ptr;}
@ -304,11 +304,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
const C& operator*() const { return *(C*)this->_ptr;} const C& operator*() const { return *(C*)this->_ptr;}
@ -341,11 +341,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
C& operator*() const { return *(C*)this->_ptr;} C& operator*() const { return *(C*)this->_ptr;}
@ -390,11 +390,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return this->_ptr == NULL; return this->_ptr == NULL;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return this->_ptr == c._ptr; } bool operator==( const Self& c) const { return this->_ptr == c._ptr; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
const C& operator*() const { return *(C*)this->_ptr;} const C& operator*() const { return *(C*)this->_ptr;}
@ -462,11 +462,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return _i >= _size; return _i >= _size;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { bool operator==( const Self& c) const {
CGAL_assertion( this->_ptr == c._ptr); // belong to the same array? CGAL_assertion( this->_ptr == c._ptr); // belong to the same array?
CGAL_assertion( _size == c._size); // same size when instantiated ? CGAL_assertion( _size == c._size); // same size when instantiated ?
@ -586,11 +586,11 @@ public:
// //
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return _i >= _size; return _i >= _size;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { bool operator==( const Self& c) const {
CGAL_assertion( this->_ptr == c._ptr); // belong to the same array? CGAL_assertion( this->_ptr == c._ptr); // belong to the same array?
CGAL_assertion( _size == c._size); // same size when instantiated ? CGAL_assertion( _size == c._size); // same size when instantiated ?

96
Circulator/test/Circulator/test_circ1.cpp
View File

@ -2375,11 +2375,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -2488,11 +2488,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -2730,11 +2730,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -2892,11 +2892,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -3303,11 +3303,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -3528,11 +3528,11 @@ void test_circulator_from_iterator() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -3737,11 +3737,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -3850,11 +3850,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -4092,11 +4092,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -4255,11 +4255,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -4666,11 +4666,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.
@ -4892,11 +4892,11 @@ void test_circulator_from_container() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = c; Circulator i = c;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == c); assert( i == c);
assert( i == c); assert( i == c);
// Do I reach myself. // Do I reach myself.

80
Circulator/test/Circulator/test_circ2.cpp
View File

@ -299,11 +299,11 @@ void test_struct(){
// Check tests for empty data structures. // Check tests for empty data structures.
Struct_circulator z = Struct_circulator(); Struct_circulator z = Struct_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Struct_circulator i = start; Struct_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -408,11 +408,11 @@ void test_struct(){
// Check tests for empty data structures. // Check tests for empty data structures.
Struct_const_circulator z = Struct_const_circulator(); Struct_const_circulator z = Struct_const_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Struct_const_circulator i = start; Struct_const_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -646,11 +646,11 @@ void test_struct(){
// Check tests for empty data structures. // Check tests for empty data structures.
Struct_bi_circulator z = Struct_bi_circulator(); Struct_bi_circulator z = Struct_bi_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Struct_bi_circulator i = start; Struct_bi_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -804,11 +804,11 @@ void test_struct(){
// Check tests for empty data structures. // Check tests for empty data structures.
Struct_bi_const_circulator z = Struct_bi_const_circulator(); Struct_bi_const_circulator z = Struct_bi_const_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Struct_bi_const_circulator i = start; Struct_bi_const_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -964,11 +964,11 @@ void test_class(){
// Check tests for empty data structures. // Check tests for empty data structures.
Class_circulator z = Class_circulator(); Class_circulator z = Class_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Class_circulator i = start; Class_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -1073,11 +1073,11 @@ void test_class(){
// Check tests for empty data structures. // Check tests for empty data structures.
Class_const_circulator z = Class_const_circulator(); Class_const_circulator z = Class_const_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Class_const_circulator i = start; Class_const_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -1311,11 +1311,11 @@ void test_class(){
// Check tests for empty data structures. // Check tests for empty data structures.
Class_bi_circulator z = Class_bi_circulator(); Class_bi_circulator z = Class_bi_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Class_bi_circulator i = start; Class_bi_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -1469,11 +1469,11 @@ void test_class(){
// Check tests for empty data structures. // Check tests for empty data structures.
Class_bi_const_circulator z = Class_bi_const_circulator(); Class_bi_const_circulator z = Class_bi_const_circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Class_bi_const_circulator i = start; Class_bi_const_circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -1886,11 +1886,11 @@ void test_array() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = start; Circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.
@ -2114,11 +2114,11 @@ void test_array() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
assert( z == CGAL_NULL); assert( z == NULL);
assert( ! (z != CGAL_NULL)); assert( ! (z != NULL));
Circulator i = start; Circulator i = start;
assert( ! (i == CGAL_NULL)); assert( ! (i == NULL));
assert( i != CGAL_NULL); assert( i != NULL);
assert( i == start); assert( i == start);
assert( i == start); assert( i == start);
// Do I reach myself. // Do I reach myself.

32
HalfedgeDS/include/CGAL/HalfedgeDS_iterator.h
View File

@ -56,11 +56,11 @@ public:
// pointer ptr() const { return & It::operator*();} // pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE CGAL_assertion_code(p)) const { bool operator==( Nullptr_t CGAL_assertion_code(p)) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return It::operator==( It()); return It::operator==( It());
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
@ -116,11 +116,11 @@ public:
// pointer ptr() const { return & It::operator*();} // pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE CGAL_assertion_code(p)) const { bool operator==( Nullptr_t CGAL_assertion_code(p)) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return It::operator==( It()); return It::operator==( It());
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
@ -194,11 +194,11 @@ public:
pointer ptr() const { return & It::operator*();} pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return It::operator==( It(NULL)); return It::operator==( It(NULL));
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
@ -257,11 +257,11 @@ public:
pointer ptr() const { return & It::operator*();} pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return It::operator==( It(NULL)); return It::operator==( It(NULL));
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
@ -315,11 +315,11 @@ public:
pointer ptr() const { return & It::operator*();} pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return It::operator==( It(NULL)); return It::operator==( It(NULL));
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
@ -378,11 +378,11 @@ public:
pointer ptr() const { return & It::operator*();} pointer ptr() const { return & It::operator*();}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return It::operator==( It(NULL)); return It::operator==( It(NULL));
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return It::operator==(i); } bool operator==( const Self& i) const { return It::operator==(i); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }

23
Installation/include/CGAL/config.h
View File

@ -27,7 +27,6 @@
#define CGAL_CONFIG_H #define CGAL_CONFIG_H
#ifdef CGAL_INCLUDE_WINDOWS_DOT_H #ifdef CGAL_INCLUDE_WINDOWS_DOT_H
// Mimic users including this file which defines min max macros // Mimic users including this file which defines min max macros
// and other names leading to name clashes // and other names leading to name clashes
@ -211,23 +210,11 @@ using std::max;
#endif #endif
// Macros for NULL and the NULL type. CGAL_BEGIN_NAMESPACE
#include <cstddef>
#ifndef CGAL_NULL_TYPE // Typedef for the type of NULL.
// Why is this GCC specific? Let's try to remove this. typedef const void * Nullptr_t; // Anticipate C++0x's std::nullptr_t
#if 0
# if defined( __GNUG__ ) CGAL_END_NAMESPACE
# define CGAL_NULL_TYPE const void*
# define CGAL_NULL 0
# else // __GNUG__ //
# define CGAL_NULL_TYPE int
# define CGAL_NULL NULL
# endif // __GNUG__ //
#else
# define CGAL_NULL_TYPE const void *
# define CGAL_NULL NULL
#endif
#endif // CGAL_NULL_TYPE
#endif // CGAL_CONFIG_H #endif // CGAL_CONFIG_H

4
Mesh_2/include/CGAL/Filter_circulator.h
View File

@ -63,11 +63,11 @@ public:
} }
}; };
bool operator==( CGAL_NULL_TYPE ) const { bool operator==( Nullptr_t ) const {
return is_null; return is_null;
} }
bool operator!=( CGAL_NULL_TYPE ) const { bool operator!=( Nullptr_t ) const {
return !is_null; return !is_null;
} }

4
Nef_2/include/CGAL/Nef_2/Object_handle.h
View File

@ -71,9 +71,9 @@ public:
bool is_empty() const bool is_empty() const
{ empty E; return assign(E); } { empty E; return assign(E); }
bool operator==(CGAL_NULL_TYPE n) const bool operator==(Nullptr_t n) const
{ CGAL_assertion(n == 0); return is_empty(); } { CGAL_assertion(n == 0); return is_empty(); }
bool operator!=(CGAL_NULL_TYPE n) const bool operator!=(Nullptr_t n) const
{ CGAL_assertion(n == 0); return !is_empty(); } { CGAL_assertion(n == 0); return !is_empty(); }
}; };

4
Nef_2/include/CGAL/Nef_2/iterator_tools.h
View File

@ -39,11 +39,11 @@ public:
// OPERATIONS Forward Category // OPERATIONS Forward Category
// --------------------------- // ---------------------------
bool operator==( CGAL_NULL_TYPE p ) const { bool operator==( Nullptr_t p ) const {
CGAL_assertion( p == NULL ); CGAL_assertion( p == NULL );
return Iter::operator==( Iter(NULL) ); return Iter::operator==( Iter(NULL) );
} }
bool operator!=( CGAL_NULL_TYPE p ) const { bool operator!=( Nullptr_t p ) const {
return !(*this == p); return !(*this == p);
} }
bool operator==( const Self& i ) const { bool operator==( const Self& i ) const {

4
Polygon/include/CGAL/Polygon_2/Polygon_2_edge_circulator.h
View File

@ -68,12 +68,12 @@ class Polygon_2_const_edge_circulator {
Polygon_2_const_edge_circulator(Vertex_const_circulator f) Polygon_2_const_edge_circulator(Vertex_const_circulator f)
: first_vertex(f) {} : first_vertex(f) {}
bool operator==( CGAL_NULL_TYPE p ) const { bool operator==( Nullptr_t p ) const {
CGAL_polygon_assertion( p == 0); CGAL_polygon_assertion( p == 0);
return (first_vertex == 0); return (first_vertex == 0);
} }
bool operator!=( CGAL_NULL_TYPE p ) const bool operator!=( Nullptr_t p ) const
{ {
return !(*this == p); return !(*this == p);
} }

6
Polygon/include/CGAL/Polygon_2/Polygon_2_vertex_circulator.h
View File

@ -71,11 +71,11 @@ public:
// OPERATIONS // OPERATIONS
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == CGAL_NULL); CGAL_assertion( p == NULL);
return (ctnr == NULL) || (ctnr->begin() == ctnr->end()); return (ctnr == NULL) || (ctnr->begin() == ctnr->end());
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& c) const { return i == c.i; } bool operator==( const Self& c) const { return i == c.i; }
bool operator!=( const Self& c) const { return !(*this == c); } bool operator!=( const Self& c) const { return !(*this == c); }
reference operator*() const { reference operator*() const {

12
Qt_widget/include/CGAL/apply_to_range.h
View File

@ -67,8 +67,8 @@ void apply_to_range(const Tr &t,
l4 = t.line_walk(POINT(xr_left, yr_bottom), POINT(xr_left, yr_top), hface4); l4 = t.line_walk(POINT(xr_left, yr_bottom), POINT(xr_left, yr_top), hface4);
//test if everything is inside or outside //test if everything is inside or outside
if( (l1 == (CGAL_NULL_TYPE) NULL) && (l2 == (CGAL_NULL_TYPE) NULL) && if( (l1 == (Nullptr_t) NULL) && (l2 == (Nullptr_t) NULL) &&
(l3 == (CGAL_NULL_TYPE) NULL) && (l4 == (CGAL_NULL_TYPE) NULL)) (l3 == (Nullptr_t) NULL) && (l4 == (Nullptr_t) NULL))
{ {
FVI v = t.finite_vertices_begin(); FVI v = t.finite_vertices_begin();
if((*v).point().x() < xr_left || (*v).point().x() > xr_right || if((*v).point().x() < xr_left || (*v).point().x() > xr_right ||
@ -88,7 +88,7 @@ void apply_to_range(const Tr &t,
//if we are here, then a part of the triangulation is inside, the other is outside //if we are here, then a part of the triangulation is inside, the other is outside
//put all the faces on the boundaries in the stack and the map //put all the faces on the boundaries in the stack and the map
if(l1 != (CGAL_NULL_TYPE) NULL) //found at least one face that intersect the TOP segment if(l1 != (Nullptr_t) NULL) //found at least one face that intersect the TOP segment
{ {
while (t.is_infinite(l1)) l1++; //we should start with a finite face while (t.is_infinite(l1)) l1++; //we should start with a finite face
do{ //put all of them in the stack; do{ //put all of them in the stack;
@ -98,7 +98,7 @@ void apply_to_range(const Tr &t,
}while(!t.is_infinite(l1) && }while(!t.is_infinite(l1) &&
t.triangle(l1).has_on_unbounded_side(POINT(xr_right, yr_top))); t.triangle(l1).has_on_unbounded_side(POINT(xr_right, yr_top)));
} }
if(l2 != (CGAL_NULL_TYPE) NULL) //found at least one face that intersect the RIGHT segment if(l2 != (Nullptr_t) NULL) //found at least one face that intersect the RIGHT segment
{ {
while (t.is_infinite(l2)) l2++; //we should start with a finite face while (t.is_infinite(l2)) l2++; //we should start with a finite face
do{ //put all of them in the stack; do{ //put all of them in the stack;
@ -110,7 +110,7 @@ void apply_to_range(const Tr &t,
}while(!t.is_infinite(l2) && }while(!t.is_infinite(l2) &&
t.triangle(l2).has_on_unbounded_side(POINT(xr_right, yr_bottom))); t.triangle(l2).has_on_unbounded_side(POINT(xr_right, yr_bottom)));
} }
if(l3 != (CGAL_NULL_TYPE) NULL) //found at least one face that intersect the BOTTOM segment if(l3 != (Nullptr_t) NULL) //found at least one face that intersect the BOTTOM segment
{ {
while (t.is_infinite(l3)) l3++; //we should start with a finite face while (t.is_infinite(l3)) l3++; //we should start with a finite face
do{ //put all of them in the stack; do{ //put all of them in the stack;
@ -122,7 +122,7 @@ void apply_to_range(const Tr &t,
}while(!t.is_infinite(l3) && }while(!t.is_infinite(l3) &&
t.triangle(l3).has_on_unbounded_side(POINT(xr_left, yr_bottom))); t.triangle(l3).has_on_unbounded_side(POINT(xr_left, yr_bottom)));
} }
if(l4 != (CGAL_NULL_TYPE) NULL) //found at least one face that intersect the LEFT segment if(l4 != (Nullptr_t) NULL) //found at least one face that intersect the LEFT segment
{ {
while (t.is_infinite(l4)) l4++; //we should start with a finite face while (t.is_infinite(l4)) l4++; //we should start with a finite face
do{ //put all of them in the stack; do{ //put all of them in the stack;

4
STL_Extension/include/CGAL/Circulator_identity.h
View File

@ -57,11 +57,11 @@ public:
Circulator current_circulator() const { return nt;} Circulator current_circulator() const { return nt;}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return ( nt == 0); //###// return ( nt == 0); //###//
} }
bool operator!=( CGAL_NULL_TYPE p) const { bool operator!=( Nullptr_t p) const {
return !(*this == p); return !(*this == p);
} }
bool operator==( const Self& i) const { bool operator==( const Self& i) const {

4
STL_Extension/include/CGAL/Circulator_on_node.h
View File

@ -59,11 +59,11 @@ public:
Ptr ptr() const { return nt;} Ptr ptr() const { return nt;}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return ( nt == 0); return ( nt == 0);
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return ( nt == i.nt); } bool operator==( const Self& i) const { return ( nt == i.nt); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
Ref operator*() const { return *nt; } Ref operator*() const { return *nt; }

4
STL_Extension/include/CGAL/Circulator_project.h
View File

@ -62,11 +62,11 @@ public:
return &(fct(*nt)); return &(fct(*nt));
} }
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return ( nt == 0); return ( nt == 0);
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return ( nt == i.nt); } bool operator==( const Self& i) const { return ( nt == i.nt); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
Ref operator*() const { return *ptr(); } Ref operator*() const { return *ptr(); }

6
STL_Extension/include/CGAL/Compact_container.h
View File

@ -686,7 +686,7 @@ namespace CGALi {
} }
// Construction from NULL // Construction from NULL
CC_iterator (CGAL_NULL_TYPE CGAL_assertion_code(n)) CC_iterator (Nullptr_t CGAL_assertion_code(n))
{ {
CGAL_assertion (n == NULL); CGAL_assertion (n == NULL);
m_ptr.p = NULL; m_ptr.p = NULL;
@ -804,7 +804,7 @@ namespace CGALi {
template < class DSC, bool Const > template < class DSC, bool Const >
inline inline
bool operator==(const CC_iterator<DSC, Const> &rhs, bool operator==(const CC_iterator<DSC, Const> &rhs,
CGAL_NULL_TYPE CGAL_assertion_code(n)) Nullptr_t CGAL_assertion_code(n))
{ {
CGAL_assertion( n == NULL); CGAL_assertion( n == NULL);
return &*rhs == NULL; return &*rhs == NULL;
@ -813,7 +813,7 @@ namespace CGALi {
template < class DSC, bool Const > template < class DSC, bool Const >
inline inline
bool operator!=(const CC_iterator<DSC, Const> &rhs, bool operator!=(const CC_iterator<DSC, Const> &rhs,
CGAL_NULL_TYPE CGAL_assertion_code(n)) Nullptr_t CGAL_assertion_code(n))
{ {
CGAL_assertion( n == NULL); CGAL_assertion( n == NULL);
return &*rhs != NULL; return &*rhs != NULL;

4
STL_Extension/include/CGAL/iterator.h
View File

@ -309,11 +309,11 @@ public:
Circulator current_circulator() const { return nt;} Circulator current_circulator() const { return nt;}
Iterator current_iterator() const { return nt;} Iterator current_iterator() const { return nt;}
bool operator==( CGAL_NULL_TYPE p) const { bool operator==( Nullptr_t p) const {
CGAL_assertion( p == 0); CGAL_assertion( p == 0);
return empty; return empty;
} }
bool operator!=( CGAL_NULL_TYPE p) const { return !(*this == p); } bool operator!=( Nullptr_t p) const { return !(*this == p); }
bool operator==( const Self& i) const { return (empty && i.empty) ||( nt == i.nt); } bool operator==( const Self& i) const { return (empty && i.empty) ||( nt == i.nt); }
bool operator!=( const Self& i) const { return !(*this == i); } bool operator!=( const Self& i) const { return !(*this == i); }
reference operator*() const { return *nt; } reference operator*() const { return *nt; }

128
STL_Extension/test/STL_Extension/test_stl_extension.cpp
View File

@ -1357,11 +1357,11 @@ void test_Circulator_identity() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -1522,11 +1522,11 @@ Assert_bidirectional_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -1944,11 +1944,11 @@ l2.destroy();
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -2175,11 +2175,11 @@ Assert_random_access_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -4469,11 +4469,11 @@ void test_Circulator_project() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -4634,11 +4634,11 @@ Assert_bidirectional_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -4900,11 +4900,11 @@ l2.destroy();
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -5065,11 +5065,11 @@ Assert_bidirectional_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -5489,11 +5489,11 @@ l2.destroy();
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -5720,11 +5720,11 @@ Assert_random_access_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -5923,11 +5923,11 @@ void test_Circulator_on_node() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -6038,11 +6038,11 @@ void test_Circulator_on_node() {
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -7347,11 +7347,11 @@ l2.destroy();
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -7577,11 +7577,11 @@ Assert_random_access_category(c_begin);
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.
@ -8348,11 +8348,11 @@ void test_N_step_adaptor_derived() {
// Check tests for empty data structures. // Check tests for empty data structures.
Circulator z = Circulator(); Circulator z = Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
Circulator i = begin; Circulator i = begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
CGAL_assertion( i == begin); CGAL_assertion( i == begin);
// Do I reach myself. // Do I reach myself.
@ -8578,11 +8578,11 @@ void test_N_step_adaptor_derived() {
// Check tests for empty data structures. // Check tests for empty data structures.
C_Circulator z = C_Circulator(); C_Circulator z = C_Circulator();
CGAL_assertion( z == CGAL_NULL); CGAL_assertion( z == NULL);
CGAL_assertion( ! (z != CGAL_NULL)); CGAL_assertion( ! (z != NULL));
C_Circulator i = c_begin; C_Circulator i = c_begin;
CGAL_assertion( ! (i == CGAL_NULL)); CGAL_assertion( ! (i == NULL));
CGAL_assertion( i != CGAL_NULL); CGAL_assertion( i != NULL);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
CGAL_assertion( i == c_begin); CGAL_assertion( i == c_begin);
// Do I reach myself. // Do I reach myself.

6
Straight_skeleton_2/include/CGAL/Straight_skeleton_vertex_base_2.h
View File

@ -76,14 +76,14 @@ protected :
( Halfedge_circulator_base<OtherHalfedgeHandle,OtherAccessPolicy> const& aOther ) ( Halfedge_circulator_base<OtherHalfedgeHandle,OtherAccessPolicy> const& aOther )
: mHandle(aOther.mHandle) {} : mHandle(aOther.mHandle) {}
bool operator==( CGAL_NULL_TYPE p ) const bool operator==( Nullptr_t p ) const
{ {
CGAL_assertion( p == CGAL_NULL ); CGAL_assertion( p == NULL );
HalfedgeHandle null ; HalfedgeHandle null ;
return mHandle == null ; return mHandle == null ;
} }
bool operator!=( CGAL_NULL_TYPE p ) const { return !(*this == p); } bool operator!=( Nullptr_t p ) const { return !(*this == p); }
private : private :

4
Surface_mesh_parameterization/include/CGAL/Convertible_circulator_project.h
View File

@ -57,8 +57,8 @@ public:
/// OPERATIONS Forward Category /// OPERATIONS Forward Category
/// --------------------------- /// ---------------------------
bool operator==(CGAL_NULL_TYPE ptr) const { return (const Base&)*this == ptr; } bool operator==(Nullptr_t ptr) const { return (const Base&)*this == ptr; }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
bool operator==(const Self& cir) const { return (const Base&)*this == cir; } bool operator==(const Self& cir) const { return (const Base&)*this == cir; }
bool operator!=(const Self& cir) const { return ! (*this == cir); } bool operator!=(const Self& cir) const { return ! (*this == cir); }

4
Surface_mesh_parameterization/include/CGAL/Convertible_filter_iterator.h
View File

@ -60,8 +60,8 @@ public:
/// OPERATIONS Forward Category /// OPERATIONS Forward Category
/// --------------------------- /// ---------------------------
bool operator==(CGAL_NULL_TYPE ptr) const { return (const Base&)*this == ptr; } bool operator==(Nullptr_t ptr) const { return (const Base&)*this == ptr; }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
bool operator==(const Self& it) const { return (const Base&)*this == it; } bool operator==(const Self& it) const { return (const Base&)*this == it; }
bool operator!=(const Self& it) const { return ! (*this == it); } bool operator!=(const Self& it) const { return ! (*this == it); }

4
Surface_mesh_parameterization/include/CGAL/Convertible_iterator_project.h
View File

@ -55,8 +55,8 @@ public:
/// OPERATIONS Forward Category /// OPERATIONS Forward Category
/// --------------------------- /// ---------------------------
bool operator==(CGAL_NULL_TYPE ptr) const { return (const Base&)*this == ptr; } bool operator==(Nullptr_t ptr) const { return (const Base&)*this == ptr; }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
bool operator==(const Self& it) const { return (const Base&)*this == it; } bool operator==(const Self& it) const { return (const Base&)*this == it; }
bool operator!=(const Self& it) const { return ! (*this == it); } bool operator!=(const Self& it) const { return ! (*this == it); }

8
Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_circulators.h
View File

@ -136,8 +136,8 @@ public:
bool operator==(const Self& cir) const { return (const Base&)*this == cir; } bool operator==(const Self& cir) const { return (const Base&)*this == cir; }
bool operator!=(const Self& cir) const { return !(*this == cir); } bool operator!=(const Self& cir) const { return !(*this == cir); }
bool operator==(CGAL_NULL_TYPE ptr) const { return (const Base&)*this == ptr; } bool operator==(Nullptr_t ptr) const { return (const Base&)*this == ptr; }
bool operator!=(CGAL_NULL_TYPE ptr) const { return !(*this == ptr); } bool operator!=(Nullptr_t ptr) const { return !(*this == ptr); }
/// operator*() and operator->() are inherited /// operator*() and operator->() are inherited
@ -522,8 +522,8 @@ public:
/// OPERATIONS Forward Category /// OPERATIONS Forward Category
/// --------------------------- /// ---------------------------
bool operator==(CGAL_NULL_TYPE ptr) const { return (const Base&)*this == ptr; } bool operator==(Nullptr_t ptr) const { return (const Base&)*this == ptr; }
bool operator!=(CGAL_NULL_TYPE ptr) const { return !(*this == ptr); } bool operator!=(Nullptr_t ptr) const { return !(*this == ptr); }
bool operator==(const Self& cir) const { return (const Base&)*this == cir; } bool operator==(const Self& cir) const { return (const Base&)*this == cir; }
bool operator!=(const Self& cir) const { return !(*this == cir); } bool operator!=(const Self& cir) const { return !(*this == cir); }

8
Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_iterators.h
View File

@ -87,11 +87,11 @@ public:
bool operator!=(const Self& it) const { return ! (*this == it); } bool operator!=(const Self& it) const { return ! (*this == it); }
/// Comparison to NULL pointer /// Comparison to NULL pointer
bool operator==(CGAL_NULL_TYPE ptr) const { bool operator==(Nullptr_t ptr) const {
CGAL_surface_mesh_parameterization_assertion(ptr == NULL); CGAL_surface_mesh_parameterization_assertion(ptr == NULL);
return (const Base&)*this == Base(); return (const Base&)*this == Base();
} }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
/// Conversion to handle /// Conversion to handle
operator Param_mesh_patch_vertex_handle<Adaptor>() const { operator Param_mesh_patch_vertex_handle<Adaptor>() const {
@ -146,11 +146,11 @@ public:
bool operator!=(const Self& it) const { return ! (*this == it); } bool operator!=(const Self& it) const { return ! (*this == it); }
/// Comparison to NULL pointer /// Comparison to NULL pointer
bool operator==(CGAL_NULL_TYPE ptr) const { bool operator==(Nullptr_t ptr) const {
CGAL_surface_mesh_parameterization_assertion(ptr == NULL); CGAL_surface_mesh_parameterization_assertion(ptr == NULL);
return (const Base&)*this == Base(); return (const Base&)*this == Base();
} }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
/// Conversion to handle /// Conversion to handle
operator Param_mesh_patch_vertex_const_handle<Adaptor>() const { operator Param_mesh_patch_vertex_const_handle<Adaptor>() const {

8
Surface_mesh_parameterization/include/CGAL/Param_mesh_patch_vertex.h
View File

@ -267,11 +267,11 @@ public:
bool operator!=(const Self& hdl) const { return ! (*this == hdl); } bool operator!=(const Self& hdl) const { return ! (*this == hdl); }
/// Comparison to NULL pointer /// Comparison to NULL pointer
bool operator==(CGAL_NULL_TYPE ptr) const { bool operator==(Nullptr_t ptr) const {
CGAL_surface_mesh_parameterization_assertion(ptr == NULL); CGAL_surface_mesh_parameterization_assertion(ptr == NULL);
return m_ptr == NULL; return m_ptr == NULL;
} }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
pointer operator->() const { return m_ptr; } pointer operator->() const { return m_ptr; }
reference operator*() const { return *m_ptr; } reference operator*() const { return *m_ptr; }
@ -413,11 +413,11 @@ public:
bool operator!=(const Self& hdl) const { return ! (*this == hdl); } bool operator!=(const Self& hdl) const { return ! (*this == hdl); }
/// Comparison to NULL pointer /// Comparison to NULL pointer
bool operator==(CGAL_NULL_TYPE ptr) const { bool operator==(Nullptr_t ptr) const {
CGAL_surface_mesh_parameterization_assertion(ptr == NULL); CGAL_surface_mesh_parameterization_assertion(ptr == NULL);
return m_ptr == NULL; return m_ptr == NULL;
} }
bool operator!=(CGAL_NULL_TYPE ptr) const { return ! (*this == ptr); } bool operator!=(Nullptr_t ptr) const { return ! (*this == ptr); }
pointer operator->() const { return m_ptr; } pointer operator->() const { return m_ptr; }
reference operator*() const { return *m_ptr; } reference operator*() const { return *m_ptr; }

2
Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2.cpp
View File

@ -177,7 +177,7 @@ private slots:
widget->lock(); widget->lock();
Line_face_circulator lfc = Line_face_circulator lfc =
tr1.line_walk(l.point(1), l.point(2)), done(lfc); tr1.line_walk(l.point(1), l.point(2)), done(lfc);
if(lfc == (CGAL_NULL_TYPE) NULL){ if(lfc == NULL){
} else { } else {
*widget << CGAL::BLUE; *widget << CGAL::BLUE;
*widget << CGAL::FillColor(CGAL::YELLOW); *widget << CGAL::FillColor(CGAL::YELLOW);

24
Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h
View File

@ -79,8 +79,8 @@ public:
bool operator!=(const Face_handle &fh) const { return pos != fh; } bool operator!=(const Face_handle &fh) const { return pos != fh; }
bool is_empty() const; bool is_empty() const;
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
bool operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
Face& Face&
operator*() const operator*() const
@ -160,8 +160,8 @@ public:
{ return pos->vertex(_ri) != vh; } { return pos->vertex(_ri) != vh; }
bool is_empty() const; bool is_empty() const;
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
bool operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
Vertex& Vertex&
operator*() const operator*() const
@ -239,8 +239,8 @@ public:
bool operator==(const Edge_circulator &vc) const; bool operator==(const Edge_circulator &vc) const;
bool operator!=(const Edge_circulator &vc) const; bool operator!=(const Edge_circulator &vc) const;
bool is_empty() const; bool is_empty() const;
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
bool operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
Edge* operator->() const { Edge* operator->() const {
edge.first=pos; edge.first=pos;
@ -357,7 +357,7 @@ return (_v == Vertex_handle() || pos == Face_handle() );
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_face_circulator_2<Tds> :: Triangulation_ds_face_circulator_2<Tds> ::
operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return (_v == Vertex_handle() || pos == Face_handle() ); return (_v == Vertex_handle() || pos == Face_handle() );
@ -366,7 +366,7 @@ operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_face_circulator_2<Tds> :: Triangulation_ds_face_circulator_2<Tds> ::
operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return ! (*this == NULL); return ! (*this == NULL);
@ -479,7 +479,7 @@ is_empty() const
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_vertex_circulator_2<Tds> :: Triangulation_ds_vertex_circulator_2<Tds> ::
operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return (_v == Vertex_handle() || pos == Face_handle()); return (_v == Vertex_handle() || pos == Face_handle());
@ -488,7 +488,7 @@ operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_vertex_circulator_2<Tds> :: Triangulation_ds_vertex_circulator_2<Tds> ::
operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return !(*this == NULL); return !(*this == NULL);
@ -599,7 +599,7 @@ is_empty() const
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_edge_circulator_2<Tds> :: Triangulation_ds_edge_circulator_2<Tds> ::
operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return (_v == Vertex_handle() || pos == Face_handle()); return (_v == Vertex_handle() || pos == Face_handle());
@ -608,7 +608,7 @@ operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const
template < class Tds > template < class Tds >
inline bool inline bool
Triangulation_ds_edge_circulator_2<Tds> :: Triangulation_ds_edge_circulator_2<Tds> ::
operator!=(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator!=(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return !(*this == NULL); return !(*this == NULL);

8
Triangulation_2/include/CGAL/Triangulation_line_face_circulator_2.h
View File

@ -99,8 +99,8 @@ public:
bool operator==(const Face_handle& fh) const { return fh == pos; } bool operator==(const Face_handle& fh) const { return fh == pos; }
bool operator!=(const Face_handle& fh) const { return fh != pos; } bool operator!=(const Face_handle& fh) const { return fh != pos; }
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const; bool operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const;
bool operator!=(CGAL_NULL_TYPE n) const; bool operator!=(Nullptr_t n) const;
bool is_empty() const; bool is_empty() const;
bool collinear_outside() const; bool collinear_outside() const;
bool locate(const Point& t, Locate_type &lt, int &li); bool locate(const Point& t, Locate_type &lt, int &li);
@ -664,7 +664,7 @@ is_empty() const
template < class Gt, class Tds > template < class Gt, class Tds >
inline bool inline bool
Triangulation_line_face_circulator_2<Gt,Tds>:: Triangulation_line_face_circulator_2<Gt,Tds>::
operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return pos == Face_handle(); return pos == Face_handle();
@ -673,7 +673,7 @@ operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const
template < class Gt, class Tds > template < class Gt, class Tds >
inline bool inline bool
Triangulation_line_face_circulator_2<Gt,Tds>:: Triangulation_line_face_circulator_2<Gt,Tds>::
operator!=(CGAL_NULL_TYPE n) const operator!=(Nullptr_t n) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return !(*this == n); return !(*this == n);

4
Triangulation_2/test/Triangulation_2/include/CGAL/_test_triangulation_circulators.h
View File

@ -45,7 +45,7 @@ _test_circulators( const Tr &T )
{ {
vc0 = vc = T.incident_vertices( vit, vit->face() ); vc0 = vc = T.incident_vertices( vit, vit->face() );
if( !vc.is_empty()){ if( !vc.is_empty()){
if( vc != CGAL_NULL){ if( vc != NULL){
do { do {
vc++; nvi++; vc++; nvi++;
} while (vc != vc0); } while (vc != vc0);
@ -54,7 +54,7 @@ _test_circulators( const Tr &T )
//test operator --() //test operator --()
vc0 = vc = T.incident_vertices( vit, vit->face() ); vc0 = vc = T.incident_vertices( vit, vit->face() );
if( !vc.is_empty()){ if( !vc.is_empty()){
if( vc != CGAL_NULL){ if( vc != NULL){
do { do {
vc--; nvi_r++; vc--; nvi_r++;
} while (vc != vc0); } while (vc != vc0);

6
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -582,15 +582,15 @@ template <class DelaunayTriangulation_3>
class Delaunay_triangulation_3<Gt, Tds>::Vertex_remover { class Delaunay_triangulation_3<Gt, Tds>::Vertex_remover {
typedef DelaunayTriangulation_3 Delaunay; typedef DelaunayTriangulation_3 Delaunay;
public: public:
typedef CGAL_NULL_TYPE Hidden_points_iterator; typedef Nullptr_t Hidden_points_iterator;
Vertex_remover(Delaunay &tmp_) : tmp(tmp_) {} Vertex_remover(Delaunay &tmp_) : tmp(tmp_) {}
Delaunay &tmp; Delaunay &tmp;
void add_hidden_points(Cell_handle) {} void add_hidden_points(Cell_handle) {}
Hidden_points_iterator hidden_points_begin() { return CGAL_NULL; } Hidden_points_iterator hidden_points_begin() { return NULL; }
Hidden_points_iterator hidden_points_end() { return CGAL_NULL; } Hidden_points_iterator hidden_points_end() { return NULL; }
Bounded_side side_of_bounded_circle(const Point &p, const Point &q, Bounded_side side_of_bounded_circle(const Point &p, const Point &q,
const Point &r, const Point &s, bool perturb = false) const { const Point &r, const Point &s, bool perturb = false) const {

16
Triangulation_3/include/CGAL/Triangulation_ds_circulators_3.h
View File

@ -146,13 +146,13 @@ public:
return ch != pos; return ch != pos;
} }
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(n)) const bool operator==(Nullptr_t CGAL_triangulation_assertion_code(n)) const
{ {
CGAL_triangulation_assertion( n == NULL); CGAL_triangulation_assertion( n == NULL);
return pos == Cell_handle(); return pos == Cell_handle();
} }
bool operator!=(CGAL_NULL_TYPE n) const bool operator!=(Nullptr_t n) const
{ {
return ! (*this == n); return ! (*this == n);
} }
@ -365,13 +365,13 @@ public:
return ! (*this == ccir); return ! (*this == ccir);
} }
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(c)) const bool operator==(Nullptr_t CGAL_triangulation_assertion_code(c)) const
{ {
CGAL_triangulation_assertion(c == CGAL_NULL); CGAL_triangulation_assertion(c == NULL);
return pos == Cell_handle(); return pos == Cell_handle();
} }
bool operator!=(CGAL_NULL_TYPE c) const bool operator!=(Nullptr_t c) const
{ {
return ! (*this == c); return ! (*this == c);
} }
@ -465,13 +465,13 @@ public:
return ! (*this == ccir); return ! (*this == ccir);
} }
bool operator==(CGAL_NULL_TYPE CGAL_triangulation_assertion_code(c)) const bool operator==(Nullptr_t CGAL_triangulation_assertion_code(c)) const
{ {
CGAL_triangulation_assertion(c == CGAL_NULL); CGAL_triangulation_assertion(c == NULL);
return pos == Cell_handle(); return pos == Cell_handle();
} }
bool operator!=(CGAL_NULL_TYPE c) const bool operator!=(Nullptr_t c) const
{ {
return ! (*this == c); return ! (*this == c);
} }

4
Visibility_complex_2/include/CGAL/Visibility_complex_2/Polygon_traits.h
View File

@ -63,7 +63,7 @@ public:
void split (Arc_2& tmp, const Bitangent_2& v) void split (Arc_2& tmp, const Bitangent_2& v)
{ {
Point_2 p=v.source_object()==object()?v.source():v.target(); Point_2 p=v.source_object()==object()?v.source():v.target();
if (first == CGAL_NULL) { if (first == NULL) {
first = object()->vertices_circulator(); first = object()->vertices_circulator();
while (*first != p) ++first; while (*first != p) ++first;
beyond = first; //++beyond; beyond = first; //++beyond;
@ -80,7 +80,7 @@ public:
void split_cw(Arc_2& tmp, const Bitangent_2& v) void split_cw(Arc_2& tmp, const Bitangent_2& v)
{ {
Point_2 p=v.source_object()==object()?v.source():v.target(); Point_2 p=v.source_object()==object()?v.source():v.target();
if (first == CGAL_NULL) { if (first == NULL) {
first = object()->vertices_circulator(); first = object()->vertices_circulator();
while (*first != p) ++first; while (*first != p) ++first;
beyond = first; //++beyond; beyond = first; //++beyond;