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

Fix capitalisation of macro name.

This commit is contained in:
Giles Bathgate 2021-04-26 21:37:02 +01:00
parent 33ea1f7c3b
commit 5ecd85248a
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Combinatorial_map/include/CGAL/Combinatorial_map_iterators_base.h
View File

@ -389,7 +389,7 @@ namespace CGAL {
{} {}
/// Destructor. /// Destructor.
~CMap_non_basic_iterator() noexcept(!CGAL_assertions) ~CMap_non_basic_iterator() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion( this->mmark_number!=Map::INVALID_MARK ); CGAL_destructor_assertion( this->mmark_number!=Map::INVALID_MARK );
if (this->mmap->get_number_of_times_mark_reserved if (this->mmap->get_number_of_times_mark_reserved

2
Documentation/doc/Documentation/Developer_manual/Chapter_checks.txt
View File

@ -243,7 +243,7 @@ and \cgalCite{cgal:a-esgc-98} (also available at
<A HREF="https://www.boost.org/community/exception_safety.html"><TT>https://www.boost.org/community/exception_safety.html</TT></A>). <A HREF="https://www.boost.org/community/exception_safety.html"><TT>https://www.boost.org/community/exception_safety.html</TT></A>).
Any destructor which might throw an exception, including a destructor which Any destructor which might throw an exception, including a destructor which
uses the `CGAL_destructor_assertion` macro, should be marked with the uses the `CGAL_destructor_assertion` macro, should be marked with the
`noexcept(!CGAL_assertions)`. `noexcept(!CGAL_ASSERTIONS_ENABLED)`.
\section secchecks_req_and_rec Requirements and recommendations \section secchecks_req_and_rec Requirements and recommendations

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

@ -445,7 +445,7 @@ friend std::ostream& operator<<
} }
/* /*
~Node() noexcept(!CGAL_assertions) ~Node() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_NEF_TRACEN("~Node: deleting node..."); CGAL_NEF_TRACEN("~Node: deleting node...");
CGAL_destructor_assertion_catch( CGAL_destructor_assertion_catch(
@ -1119,7 +1119,7 @@ bool update( Node_handle node,
return (left_updated || right_updated); return (left_updated || right_updated);
} }
/* /*
~K3_tree() noexcept(!CGAL_assertions) ~K3_tree() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_NEF_TRACEN("~K3_tree: deleting root..."); CGAL_NEF_TRACEN("~K3_tree: deleting root...");
CGAL_destructor_assertion_catch( CGAL_destructor_assertion_catch(

4
Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
View File

@ -126,7 +126,7 @@ public:
virtual void add_vertex(Vertex_handle) {} virtual void add_vertex(Vertex_handle) {}
virtual ~SNC_point_locator() noexcept(!CGAL_assertions) virtual ~SNC_point_locator() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_NEF_CLOG(""); CGAL_NEF_CLOG("");
CGAL_NEF_CLOG("construction_time: "<<ct_t.time()); CGAL_NEF_CLOG("construction_time: "<<ct_t.time());
@ -423,7 +423,7 @@ public:
return updated; return updated;
} }
virtual ~SNC_point_locator_by_spatial_subdivision() noexcept(!CGAL_assertions) virtual ~SNC_point_locator_by_spatial_subdivision() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_warning(initialized || CGAL_destructor_warning(initialized ||
candidate_provider == 0); // required? candidate_provider == 0); // required?

2
Nef_S2/include/CGAL/Nef_S2/Sphere_map.h
View File

@ -229,7 +229,7 @@ public:
Sphere_map(bool = false) : boundary_item_(boost::none), Sphere_map(bool = false) : boundary_item_(boost::none),
svertices_(), sedges_(), sfaces_(), shalfloop_() {} svertices_(), sedges_(), sfaces_(), shalfloop_() {}
~Sphere_map() noexcept(!CGAL_assertions) ~Sphere_map() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion_catch( CGAL_destructor_assertion_catch(
clear(); clear();

2
Nef_S2/include/CGAL/Nef_polyhedron_S2.h
View File

@ -73,7 +73,7 @@ class Nef_polyhedron_S2_rep {
public: public:
Nef_polyhedron_S2_rep() : sm_() {} Nef_polyhedron_S2_rep() : sm_() {}
Nef_polyhedron_S2_rep(const Self&) : sm_() {} Nef_polyhedron_S2_rep(const Self&) : sm_() {}
~Nef_polyhedron_S2_rep() noexcept(!CGAL_assertions) ~Nef_polyhedron_S2_rep() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion_catch( CGAL_destructor_assertion_catch(
sm_.clear(); sm_.clear();

2
Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h
View File

@ -191,7 +191,7 @@ public:
CGAL_assertion_code(check_protocoll = 0;) CGAL_assertion_code(check_protocoll = 0;)
} }
~Polyhedron_incremental_builder_3() noexcept(!CGAL_assertions) ~Polyhedron_incremental_builder_3() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion( check_protocoll == 0); CGAL_destructor_assertion( check_protocoll == 0);
} }

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

@ -46,7 +46,7 @@ class Handle
Handle() noexcept Handle() noexcept
: PTR(static_cast<Rep*>(0)) {} : PTR(static_cast<Rep*>(0)) {}
Handle(const Handle& x) noexcept(!(CGAL_preconditions || CGAL_assertions)) Handle(const Handle& x) noexcept(!(CGAL_PRECONDITIONS_ENABLED || CGAL_ASSERTIONS_ENABLED))
{ {
CGAL_precondition( x.PTR != static_cast<Rep*>(0) ); CGAL_precondition( x.PTR != static_cast<Rep*>(0) );
PTR = x.PTR; PTR = x.PTR;
@ -67,7 +67,7 @@ class Handle
} }
Handle& Handle&
operator=(const Handle& x) noexcept(!CGAL_preconditions) operator=(const Handle& x) noexcept(!CGAL_PRECONDITIONS_ENABLED)
{ {
CGAL_precondition( x.PTR != static_cast<Rep*>(0) ); CGAL_precondition( x.PTR != static_cast<Rep*>(0) );
x.PTR->count++; x.PTR->count++;

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

@ -102,7 +102,7 @@ public:
ptr_ = p; ptr_ = p;
} }
Handle_for(const Handle_for& h) noexcept(!CGAL_assertions) Handle_for(const Handle_for& h) noexcept(!CGAL_ASSERTIONS_ENABLED)
: ptr_(h.ptr_) : ptr_(h.ptr_)
{ {
CGAL_assume (ptr_->count > 0); CGAL_assume (ptr_->count > 0);
@ -110,7 +110,7 @@ public:
} }
Handle_for& Handle_for&
operator=(const Handle_for& h) noexcept(!CGAL_assertions) operator=(const Handle_for& h) noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
Handle_for tmp = h; Handle_for tmp = h;
swap(tmp); swap(tmp);

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

@ -590,7 +590,7 @@ public:
/*! /*!
* Destructor. [takes O(n) operations] * Destructor. [takes O(n) operations]
*/ */
virtual ~Multiset () noexcept(!CGAL_assertions); virtual ~Multiset () noexcept(!CGAL_ASSERTIONS_ENABLED);
/*! /*!
* Assignment operator. [takes O(n) operations] * Assignment operator. [takes O(n) operations]
@ -1565,7 +1565,7 @@ Multiset<Type, Compare, Allocator, UseCompactContainer>::Multiset (const Self& t
// Destructor. // Destructor.
// //
template <class Type, class Compare, typename Allocator, typename UseCompactContainer> template <class Type, class Compare, typename Allocator, typename UseCompactContainer>
Multiset<Type, Compare, Allocator, UseCompactContainer>::~Multiset () noexcept(!CGAL_assertions) Multiset<Type, Compare, Allocator, UseCompactContainer>::~Multiset () noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
if (UseCompactContainer::value) if (UseCompactContainer::value)
return; return;

8
STL_Extension/include/CGAL/assertions.h
View File

@ -77,7 +77,7 @@ inline bool possibly(Uncertain<bool> c);
// ---------- // ----------
#if defined(CGAL_NO_ASSERTIONS) #if defined(CGAL_NO_ASSERTIONS)
# define CGAL_assertions false # define CGAL_ASSERTIONS_ENABLED false
# define CGAL_assertion(EX) (static_cast<void>(0)) # define CGAL_assertion(EX) (static_cast<void>(0))
# define CGAL_destructor_assertion(EX) (static_cast<void>(0)) # define CGAL_destructor_assertion(EX) (static_cast<void>(0))
# define CGAL_destructor_assertion_catch(CODE) CODE # define CGAL_destructor_assertion_catch(CODE) CODE
@ -91,7 +91,7 @@ inline bool possibly(Uncertain<bool> c);
# define CGAL_assume_code(CODE) CGAL_assertion_code(CODE) # define CGAL_assume_code(CODE) CGAL_assertion_code(CODE)
# endif // not def CGAL_ASSUME # endif // not def CGAL_ASSUME
#else // no CGAL_NO_ASSERTIONS #else // no CGAL_NO_ASSERTIONS
# define CGAL_assertions true # define CGAL_ASSERTIONS_ENABLED true
# define CGAL_assertion(EX) \ # define CGAL_assertion(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__)) (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
# if __cpp_lib_uncaught_exceptions || ( _MSVC_LANG >= 201703L ) // C++17 # if __cpp_lib_uncaught_exceptions || ( _MSVC_LANG >= 201703L ) // C++17
@ -193,12 +193,12 @@ inline bool possibly(Uncertain<bool> c);
// ------------- // -------------
#if defined(CGAL_NO_PRECONDITIONS) #if defined(CGAL_NO_PRECONDITIONS)
# define CGAL_preconditions false # define CGAL_PRECONDITIONS_ENABLED false
# define CGAL_precondition(EX) (static_cast<void>(0)) # define CGAL_precondition(EX) (static_cast<void>(0))
# define CGAL_precondition_msg(EX,MSG) (static_cast<void>(0)) # define CGAL_precondition_msg(EX,MSG) (static_cast<void>(0))
# define CGAL_precondition_code(CODE) # define CGAL_precondition_code(CODE)
#else #else
# define CGAL_preconditions true # define CGAL_PRECONDITIONS_ENABLED true
# define CGAL_precondition(EX) \ # define CGAL_precondition(EX) \
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__)) (CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
# define CGAL_precondition_msg(EX,MSG) \ # define CGAL_precondition_msg(EX,MSG) \

2
Straight_skeleton_2/include/CGAL/Straight_skeleton_2/Straight_skeleton_aux.h
View File

@ -164,7 +164,7 @@ private:
Ref_counted_base& operator=( Ref_counted_base const &); Ref_counted_base& operator=( Ref_counted_base const &);
protected: protected:
Ref_counted_base(): mCount(0) {} Ref_counted_base(): mCount(0) {}
virtual ~Ref_counted_base() noexcept(!CGAL_assertions) {} virtual ~Ref_counted_base() noexcept(!CGAL_ASSERTIONS_ENABLED) {}
public: public:
void AddRef() const { ++mCount; } void AddRef() const { ++mCount; }
void Release() const void Release() const

2
Stream_support/include/CGAL/IO/VRML/VRML_2_ostream.h
View File

@ -30,7 +30,7 @@ class VRML_2_ostream
public: public:
VRML_2_ostream() : m_os(nullptr) {} VRML_2_ostream() : m_os(nullptr) {}
VRML_2_ostream(std::ostream& o) : m_os(&o) { header(); } VRML_2_ostream(std::ostream& o) : m_os(&o) { header(); }
~VRML_2_ostream() noexcept(!CGAL_assertions) ~VRML_2_ostream() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion_catch( CGAL_destructor_assertion_catch(
close(); close();

2
Surface_mesher/archive/include/CGAL/builder.h
View File

@ -175,7 +175,7 @@ public:
CGAL_assertion_code(check_protocoll = 0;) CGAL_assertion_code(check_protocoll = 0;)
} }
~Enriched_polyhedron_incremental_builder_3() noexcept(!CGAL_assertions) ~Enriched_polyhedron_incremental_builder_3() noexcept(!CGAL_ASSERTIONS_ENABLED)
{ {
CGAL_destructor_assertion( check_protocoll == 0); CGAL_destructor_assertion( check_protocoll == 0);
} }