mirror of https://github.com/CGAL/cgal
missing () in macro + typo fixes
This commit is contained in:
parent
8ed2990381
commit
37580e9daf
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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>
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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;
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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;
|
||||||
|
|
|
||||||
|
|
@ -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)
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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));
|
||||||
CGAL_static_assertion(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
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -329,7 +329,7 @@ regular_neighbor_coordinates_2(const Rt& rt,
|
||||||
typename Rt::Face_handle start,
|
typename Rt::Face_handle start,
|
||||||
std::enable_if_t<
|
std::enable_if_t<
|
||||||
!is_iterator_v<OutputFunctor>
|
!is_iterator_v<OutputFunctor>
|
||||||
>::type* = 0)
|
>* = 0)
|
||||||
{
|
{
|
||||||
return regular_neighbor_coordinates_2(rt, p, out, fct, Emptyset_iterator(), start);
|
return regular_neighbor_coordinates_2(rt, p, out, fct, Emptyset_iterator(), start);
|
||||||
}
|
}
|
||||||
|
|
@ -342,7 +342,7 @@ regular_neighbor_coordinates_2(const Rt& rt,
|
||||||
const typename Rt::Weighted_point& p,
|
const typename Rt::Weighted_point& p,
|
||||||
OutputIterator out,
|
OutputIterator out,
|
||||||
OutputFunctor fct,
|
OutputFunctor fct,
|
||||||
std::enable_if_c<
|
std::enable_if_t<
|
||||||
!boost::is_convertible<OutputFunctor,
|
!boost::is_convertible<OutputFunctor,
|
||||||
typename Rt::Face_handle>::value
|
typename Rt::Face_handle>::value
|
||||||
>* = 0)
|
>* = 0)
|
||||||
|
|
@ -424,7 +424,7 @@ regular_neighbor_coordinates_2(const Rt& rt,
|
||||||
EdgeIterator hole_end,
|
EdgeIterator hole_end,
|
||||||
VertexIterator hidden_vertices_begin,
|
VertexIterator hidden_vertices_begin,
|
||||||
VertexIterator hidden_vertices_end,
|
VertexIterator hidden_vertices_end,
|
||||||
std::enable_if_t!<
|
std::enable_if_t<
|
||||||
!is_iterator_v<OutputFunctor>
|
!is_iterator_v<OutputFunctor>
|
||||||
>* = 0)
|
>* = 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ public:
|
||||||
|
|
||||||
typedef R_ R;
|
typedef R_ R;
|
||||||
|
|
||||||
template<class...U,class=std::enable_if_t<!std::is_same<std::tuple<typename std::decay<U>::type...>::value,std::tuple<Sphere_d> >::value>> explicit Sphere_d(U&&...u)
|
template<class...U,class=typename std::enable_if_t<!std::is_same<std::tuple<typename std::decay<U>::type...>,std::tuple<Sphere_d> >::value>> explicit Sphere_d(U&&...u)
|
||||||
: Rep(CSBase()(std::forward<U>(u)...)){}
|
: Rep(CSBase()(std::forward<U>(u)...)){}
|
||||||
|
|
||||||
// // called from Construct_point_d
|
// // called from Construct_point_d
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ struct checked_NT {
|
||||||
checked_NT():x1(),x2(){verify();}
|
checked_NT():x1(),x2(){verify();}
|
||||||
checked_NT(checked_NT const&t):x1(t.x1),x2(t.x2){verify();}
|
checked_NT(checked_NT const&t):x1(t.x1),x2(t.x2){verify();}
|
||||||
checked_NT& operator=(checked_NT const&t){x1=t.x1;x2=t.x2;verify();return *this;}
|
checked_NT& operator=(checked_NT const&t){x1=t.x1;x2=t.x2;verify();return *this;}
|
||||||
template<class T> checked_NT(T const&t,std::enable_if_t<is_implicit_convertible<T,NT1>::value,int>=0):x1(t),x2(t){verify();}
|
template<class T> checked_NT(T const&t,std::enable_if_t<is_implicit_convertible<T,NT1>::value,int> = 0):x1(t),x2(t){verify();}
|
||||||
template<class T> explicit checked_NT(T const&t,std::enable_if_t<!is_implicit_convertible<T,NT1>::value,int>=0):x1(t),x2(t){verify();}
|
template<class T> explicit checked_NT(T const&t,std::enable_if_t<!is_implicit_convertible<T,NT1>::value,int> = 0):x1(t),x2(t){verify();}
|
||||||
/*TODO: enable_if to restrict the types*/
|
/*TODO: enable_if to restrict the types*/
|
||||||
template<class T> checked_NT& operator=(T const&t){x1=t;x2=t;verify();return *this;}
|
template<class T> checked_NT& operator=(T const&t){x1=t;x2=t;verify();return *this;}
|
||||||
checked_NT operator-()const{return checked_NT(pieces(),-x1,-x2);}
|
checked_NT operator-()const{return checked_NT(pieces(),-x1,-x2);}
|
||||||
|
|
|
||||||
|
|
@ -399,7 +399,7 @@ struct TweakedGetVertexPointMap
|
||||||
|
|
||||||
template <class PT, class NP, class PM>
|
template <class PT, class NP, class PM>
|
||||||
boost::optional< typename TweakedGetVertexPointMap<PT, NP, PM>::type >
|
boost::optional< typename TweakedGetVertexPointMap<PT, NP, PM>::type >
|
||||||
get_vpm(const NP& np, boost::optional<PM*> opm, boost::true_type)
|
get_vpm(const NP& np, boost::optional<PM*> opm, std::true_type)
|
||||||
{
|
{
|
||||||
if (boost::none == opm) return boost::none;
|
if (boost::none == opm) return boost::none;
|
||||||
return parameters::choose_parameter(
|
return parameters::choose_parameter(
|
||||||
|
|
@ -409,7 +409,7 @@ get_vpm(const NP& np, boost::optional<PM*> opm, boost::true_type)
|
||||||
|
|
||||||
template <class PT, class NP, class PM>
|
template <class PT, class NP, class PM>
|
||||||
boost::optional< typename TweakedGetVertexPointMap<PT, NP, PM>::type >
|
boost::optional< typename TweakedGetVertexPointMap<PT, NP, PM>::type >
|
||||||
get_vpm(const NP&, boost::optional<PM*> opm, boost::false_type)
|
get_vpm(const NP&, boost::optional<PM*> opm, std::false_type)
|
||||||
{
|
{
|
||||||
if (boost::none == opm) return boost::none;
|
if (boost::none == opm) return boost::none;
|
||||||
return typename TweakedGetVertexPointMap<PT, NP, PM>::type();
|
return typename TweakedGetVertexPointMap<PT, NP, PM>::type();
|
||||||
|
|
|
||||||
|
|
@ -10,14 +10,14 @@ using CGAL::Tag_true;
|
||||||
using CGAL::Tag_false;
|
using CGAL::Tag_false;
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
CGAL_static_assertion(is_same< Tag_true::value_type, bool >::value);
|
static_assert(is_same< Tag_true::value_type, bool >::value,"");
|
||||||
CGAL_static_assertion(is_same< Tag_true::type, Tag_true >::value);
|
static_assert(is_same< Tag_true::type, Tag_true >::value,"");
|
||||||
CGAL_static_assertion(Tag_true::value== true);
|
static_assert(Tag_true::value== true,"");
|
||||||
assert( Tag_true() == true );
|
assert( Tag_true() == true );
|
||||||
|
|
||||||
CGAL_static_assertion(is_same< Tag_false::value_type, bool >::value);
|
static_assert(is_same< Tag_false::value_type, bool >::value,"");
|
||||||
CGAL_static_assertion(is_same< Tag_false::type, Tag_false >::value);
|
static_assert(is_same< Tag_false::type, Tag_false >::value,"");
|
||||||
CGAL_static_assertion(Tag_false::value == false);
|
static_assert(Tag_false::value == false,"");
|
||||||
assert( Tag_false() == false );
|
assert( Tag_false() == false );
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
|
|
@ -34,13 +34,15 @@ namespace CGAL {
|
||||||
namespace internal{
|
namespace internal{
|
||||||
template <class SearchTraits,class Point>
|
template <class SearchTraits,class Point>
|
||||||
struct Is_from_point_from_adapter_traits{
|
struct Is_from_point_from_adapter_traits{
|
||||||
typedef boost::false_type type;
|
typedef std::false_type type;
|
||||||
|
static const bool value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
template <class K,class PM,class Base,class Point>
|
template <class K,class PM,class Base,class Point>
|
||||||
struct Is_from_point_from_adapter_traits<Search_traits_adapter<K,PM,Base>,Point>{
|
struct Is_from_point_from_adapter_traits<Search_traits_adapter<K,PM,Base>,Point>{
|
||||||
typedef typename std::is_same<Point,typename Base::Point_d> type;
|
typedef typename std::is_same<Point,typename Base::Point_d> type;
|
||||||
|
static const bool value = type::value;
|
||||||
};
|
};
|
||||||
} //namespace internal
|
} //namespace internal
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
CGAL_static_assertion(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:
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue