mirror of https://github.com/CGAL/cgal
Fix capitalisation of macro name.
This commit is contained in:
parent
33ea1f7c3b
commit
5ecd85248a
|
|
@ -389,7 +389,7 @@ namespace CGAL {
|
|||
{}
|
||||
|
||||
/// 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 );
|
||||
if (this->mmap->get_number_of_times_mark_reserved
|
||||
|
|
|
|||
|
|
@ -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>).
|
||||
Any destructor which might throw an exception, including a destructor which
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -445,7 +445,7 @@ friend std::ostream& operator<<
|
|||
}
|
||||
|
||||
/*
|
||||
~Node() noexcept(!CGAL_assertions)
|
||||
~Node() noexcept(!CGAL_ASSERTIONS_ENABLED)
|
||||
{
|
||||
CGAL_NEF_TRACEN("~Node: deleting node...");
|
||||
CGAL_destructor_assertion_catch(
|
||||
|
|
@ -1119,7 +1119,7 @@ bool update( Node_handle node,
|
|||
return (left_updated || right_updated);
|
||||
}
|
||||
/*
|
||||
~K3_tree() noexcept(!CGAL_assertions)
|
||||
~K3_tree() noexcept(!CGAL_ASSERTIONS_ENABLED)
|
||||
{
|
||||
CGAL_NEF_TRACEN("~K3_tree: deleting root...");
|
||||
CGAL_destructor_assertion_catch(
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ public:
|
|||
|
||||
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("construction_time: "<<ct_t.time());
|
||||
|
|
@ -423,7 +423,7 @@ public:
|
|||
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 ||
|
||||
candidate_provider == 0); // required?
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ public:
|
|||
Sphere_map(bool = false) : boundary_item_(boost::none),
|
||||
svertices_(), sedges_(), sfaces_(), shalfloop_() {}
|
||||
|
||||
~Sphere_map() noexcept(!CGAL_assertions)
|
||||
~Sphere_map() noexcept(!CGAL_ASSERTIONS_ENABLED)
|
||||
{
|
||||
CGAL_destructor_assertion_catch(
|
||||
clear();
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class Nef_polyhedron_S2_rep {
|
|||
public:
|
||||
Nef_polyhedron_S2_rep() : 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(
|
||||
sm_.clear();
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ public:
|
|||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class Handle
|
|||
Handle() noexcept
|
||||
: 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) );
|
||||
PTR = x.PTR;
|
||||
|
|
@ -67,7 +67,7 @@ class 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) );
|
||||
x.PTR->count++;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ public:
|
|||
ptr_ = p;
|
||||
}
|
||||
|
||||
Handle_for(const Handle_for& h) noexcept(!CGAL_assertions)
|
||||
Handle_for(const Handle_for& h) noexcept(!CGAL_ASSERTIONS_ENABLED)
|
||||
: ptr_(h.ptr_)
|
||||
{
|
||||
CGAL_assume (ptr_->count > 0);
|
||||
|
|
@ -110,7 +110,7 @@ public:
|
|||
}
|
||||
|
||||
Handle_for&
|
||||
operator=(const Handle_for& h) noexcept(!CGAL_assertions)
|
||||
operator=(const Handle_for& h) noexcept(!CGAL_ASSERTIONS_ENABLED)
|
||||
{
|
||||
Handle_for tmp = h;
|
||||
swap(tmp);
|
||||
|
|
|
|||
|
|
@ -590,7 +590,7 @@ public:
|
|||
/*!
|
||||
* Destructor. [takes O(n) operations]
|
||||
*/
|
||||
virtual ~Multiset () noexcept(!CGAL_assertions);
|
||||
virtual ~Multiset () noexcept(!CGAL_ASSERTIONS_ENABLED);
|
||||
|
||||
/*!
|
||||
* Assignment operator. [takes O(n) operations]
|
||||
|
|
@ -1565,7 +1565,7 @@ Multiset<Type, Compare, Allocator, UseCompactContainer>::Multiset (const Self& t
|
|||
// Destructor.
|
||||
//
|
||||
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)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ inline bool possibly(Uncertain<bool> c);
|
|||
// ----------
|
||||
|
||||
#if defined(CGAL_NO_ASSERTIONS)
|
||||
# define CGAL_assertions false
|
||||
# define CGAL_ASSERTIONS_ENABLED false
|
||||
# define CGAL_assertion(EX) (static_cast<void>(0))
|
||||
# define CGAL_destructor_assertion(EX) (static_cast<void>(0))
|
||||
# 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)
|
||||
# endif // not def CGAL_ASSUME
|
||||
#else // no CGAL_NO_ASSERTIONS
|
||||
# define CGAL_assertions true
|
||||
# define CGAL_ASSERTIONS_ENABLED true
|
||||
# define CGAL_assertion(EX) \
|
||||
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::assertion_fail( # EX , __FILE__, __LINE__))
|
||||
# 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)
|
||||
# define CGAL_preconditions false
|
||||
# define CGAL_PRECONDITIONS_ENABLED false
|
||||
# define CGAL_precondition(EX) (static_cast<void>(0))
|
||||
# define CGAL_precondition_msg(EX,MSG) (static_cast<void>(0))
|
||||
# define CGAL_precondition_code(CODE)
|
||||
#else
|
||||
# define CGAL_preconditions true
|
||||
# define CGAL_PRECONDITIONS_ENABLED true
|
||||
# define CGAL_precondition(EX) \
|
||||
(CGAL::possibly(EX)?(static_cast<void>(0)): ::CGAL::precondition_fail( # EX , __FILE__, __LINE__))
|
||||
# define CGAL_precondition_msg(EX,MSG) \
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ private:
|
|||
Ref_counted_base& operator=( Ref_counted_base const &);
|
||||
protected:
|
||||
Ref_counted_base(): mCount(0) {}
|
||||
virtual ~Ref_counted_base() noexcept(!CGAL_assertions) {}
|
||||
virtual ~Ref_counted_base() noexcept(!CGAL_ASSERTIONS_ENABLED) {}
|
||||
public:
|
||||
void AddRef() const { ++mCount; }
|
||||
void Release() const
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class VRML_2_ostream
|
|||
public:
|
||||
VRML_2_ostream() : m_os(nullptr) {}
|
||||
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(
|
||||
close();
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ public:
|
|||
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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue