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

use CGAL_static_assertion 

static_assert(b) is only available in c++17
This commit is contained in:
Sébastien Loriot 2022-06-10 10:10:12 +02:00
parent 27514ed036
commit 8ed2990381
9 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
View File

@ -90,10 +90,10 @@ public:
typedef typename Gt_adaptor_2::Top_side_category Top_side_category; typedef typename Gt_adaptor_2::Top_side_category Top_side_category;
typedef typename Gt_adaptor_2::Right_side_category Right_side_category; typedef typename Gt_adaptor_2::Right_side_category Right_side_category;
static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value); CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value);
static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value); CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value);
static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value); CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value);
static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value); CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value);
//@} //@}
/*! \struct /*! \struct

16
Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
View File

@ -91,14 +91,14 @@ public:
typedef typename Gt_adaptor_2::Top_side_category Top_side_category; typedef typename Gt_adaptor_2::Top_side_category Top_side_category;
typedef typename Gt_adaptor_2::Right_side_category Right_side_category; typedef typename Gt_adaptor_2::Right_side_category Right_side_category;
static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Left_side_category, Arr_identified_side_tag >::value); std::is_same< Left_side_category, Arr_identified_side_tag >::value);
static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Bottom_side_category, Arr_contracted_side_tag >::value); std::is_same< Bottom_side_category, Arr_contracted_side_tag >::value);
static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Top_side_category, Arr_contracted_side_tag >::value); std::is_same< Top_side_category, Arr_contracted_side_tag >::value);
static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Right_side_category, Arr_identified_side_tag >::value); std::is_same< Right_side_category, Arr_identified_side_tag >::value);
//@} //@}
/*! \struct /*! \struct

16
Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
View File

@ -87,14 +87,14 @@ public:
typedef typename Gt_adaptor_2::Top_side_category Top_side_category; typedef typename Gt_adaptor_2::Top_side_category Top_side_category;
typedef typename Gt_adaptor_2::Right_side_category Right_side_category; typedef typename Gt_adaptor_2::Right_side_category Right_side_category;
static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Left_side_category, Arr_open_side_tag >::value); std::is_same< Left_side_category, Arr_open_side_tag >::value);
static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Bottom_side_category, Arr_open_side_tag >::value); std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag>::value || CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag>::value ||
std::is_same< Top_side_category, Arr_open_side_tag >::value); std::is_same< Top_side_category, Arr_open_side_tag >::value);
static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Right_side_category, Arr_open_side_tag >::value); std::is_same< Right_side_category, Arr_open_side_tag >::value);
//@} //@}
/*! \struct /*! \struct

8
Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
View File

@ -79,10 +79,10 @@ public:
typedef typename Traits_adaptor_2::Top_side_category Top_side_category; typedef typename Traits_adaptor_2::Top_side_category Top_side_category;
typedef typename Traits_adaptor_2::Right_side_category Right_side_category; typedef typename Traits_adaptor_2::Right_side_category Right_side_category;
static_assert(Arr_sane_identified_tagging<Left_side_category, CGAL_static_assertion(Arr_sane_identified_tagging<Left_side_category,
Bottom_side_category, Bottom_side_category,
Top_side_category, Top_side_category,
Right_side_category>::value); Right_side_category>::value);
public: public:
typedef Arrangement_on_surface_2<Geometry_traits_2, Topology_traits> typedef Arrangement_on_surface_2<Geometry_traits_2, Topology_traits>

8
Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
View File

@ -67,10 +67,10 @@ protected:
typedef typename Traits_adaptor_2::Top_side_category Top_side_category; typedef typename Traits_adaptor_2::Top_side_category Top_side_category;
typedef typename Traits_adaptor_2::Right_side_category Right_side_category; typedef typename Traits_adaptor_2::Right_side_category Right_side_category;
static_assert(Arr_sane_identified_tagging<Left_side_category, CGAL_static_assertion(Arr_sane_identified_tagging<Left_side_category,
Bottom_side_category, Bottom_side_category,
Top_side_category, Top_side_category,
Right_side_category>::value); Right_side_category>::value);
public: public:
typedef ZoneVisitor_ Visitor; typedef ZoneVisitor_ Visitor;

16
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
View File

@ -123,14 +123,14 @@ public:
typedef typename Arr::Right_side_category Right_side_category; typedef typename Arr::Right_side_category Right_side_category;
// a side is either oblivious or open (unbounded) // a side is either oblivious or open (unbounded)
static_assert(std::is_same<Left_side_category, Arr_oblivious_side_tag>::value || CGAL_static_assertion(std::is_same<Left_side_category, Arr_oblivious_side_tag>::value ||
std::is_same<Left_side_category, Arr_open_side_tag>::value); std::is_same<Left_side_category, Arr_open_side_tag>::value);
static_assert(std::is_same<Bottom_side_category, Arr_oblivious_side_tag>::value || CGAL_static_assertion(std::is_same<Bottom_side_category, Arr_oblivious_side_tag>::value ||
std::is_same<Bottom_side_category, Arr_open_side_tag>::value); std::is_same<Bottom_side_category, Arr_open_side_tag>::value);
static_assert(std::is_same<Top_side_category, Arr_oblivious_side_tag>::value || CGAL_static_assertion(std::is_same<Top_side_category, Arr_oblivious_side_tag>::value ||
std::is_same<Top_side_category, Arr_open_side_tag> >::value); std::is_same<Top_side_category, Arr_open_side_tag> >::value);
static_assert(std::is_same<Right_side_category, Arr_oblivious_side_tag>::value || CGAL_static_assertion(std::is_same<Right_side_category, Arr_oblivious_side_tag>::value ||
std::is_same<Right_side_category, Arr_open_side_tag>::value); std::is_same<Right_side_category, Arr_open_side_tag>::value);
typedef typename Arr::Halfedge_handle Halfedge_handle; typedef typename Arr::Halfedge_handle Halfedge_handle;
typedef typename Arr::Vertex_handle Vertex_handle; typedef typename Arr::Vertex_handle Vertex_handle;

16
Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
View File

@ -53,14 +53,14 @@ public:
typedef typename Base::Right_side_category Right_side_category; typedef typename Base::Right_side_category Right_side_category;
// a side is either oblivious or open (unbounded) // a side is either oblivious or open (unbounded)
static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Left_side_category, Arr_open_side_tag >::value); std::is_same< Left_side_category, Arr_open_side_tag >::value);
static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Bottom_side_category, Arr_open_side_tag >::value); std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Top_side_category, Arr_open_side_tag > >::value); std::is_same< Top_side_category, Arr_open_side_tag > >::value);
static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value || CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
std::is_same< Right_side_category, Arr_open_side_tag > >::value); std::is_same< Right_side_category, Arr_open_side_tag > >::value);
class Ex_point_2 class Ex_point_2
{ {

12
STL_Extension/test/STL_Extension/test_Boolean_tag.cpp
View File

@ -10,14 +10,14 @@ using CGAL::Tag_true;
using CGAL::Tag_false; using CGAL::Tag_false;
int main() { int main() {
static_assert(is_same< Tag_true::value_type, bool >::value); CGAL_static_assertion(is_same< Tag_true::value_type, bool >::value);
static_assert(is_same< Tag_true::type, Tag_true >::value); CGAL_static_assertion(is_same< Tag_true::type, Tag_true >::value);
static_assert(Tag_true::value== true); CGAL_static_assertion(Tag_true::value== true);
assert( Tag_true() == true ); assert( Tag_true() == true );
static_assert(is_same< Tag_false::value_type, bool >::value); CGAL_static_assertion(is_same< Tag_false::value_type, bool >::value);
static_assert(is_same< Tag_false::type, Tag_false >::value); CGAL_static_assertion(is_same< Tag_false::type, Tag_false >::value);
static_assert(Tag_false::value == false); CGAL_static_assertion(Tag_false::value == false);
assert( Tag_false() == false ); assert( Tag_false() == false );
return 0; return 0;

4
Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h
View File

@ -129,8 +129,8 @@ public:
typedef typename Traits_adaptor_2::Top_side_category Top_side_category; typedef typename Traits_adaptor_2::Top_side_category Top_side_category;
typedef typename Traits_adaptor_2::Right_side_category Right_side_category; typedef typename Traits_adaptor_2::Right_side_category Right_side_category;
static_assert(Arr_sane_identified_tagging< Left_side_category, Bottom_side_category, CGAL_static_assertion(Arr_sane_identified_tagging< Left_side_category, Bottom_side_category,
Top_side_category, Right_side_category >::value); Top_side_category, Right_side_category >::value);
protected: protected:
/*! /*!