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

Compile in C++03 and C++14

This commit is contained in:
Andreas Fabri 2020-03-02 12:52:23 +00:00
parent b1c2910b9e
commit a3719c3628
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NewKernel_d/include/CGAL/Epick_d.h
View File

@ -75,8 +75,8 @@ template<class Dim>
struct Epick_d_help3
: CGAL_BASE
{
constexpr Epick_d_help3(){}
constexpr Epick_d_help3(int d):CGAL_BASE(d){}
CGAL_CONSTEXPR Epick_d_help3(){}
CGAL_CONSTEXPR Epick_d_help3(int d):CGAL_BASE(d){}
};
#undef CGAL_BASE
#define CGAL_BASE \

14
NewKernel_d/include/CGAL/NewKernel_d/Cartesian_filter_K.h
View File

@ -31,22 +31,22 @@ namespace CGAL {
// It would be nicer to write the table in the other direction: Orientation_of_points_tag is good up to 6, Side_of_oriented_sphere_tag up to 5, etc.
template<class> struct Functors_without_division { typedef typeset<> type; };
template<> struct Functors_without_division<Dimension_tag<1>> {
template<> struct Functors_without_division<Dimension_tag<1> > {
typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
};
template<> struct Functors_without_division<Dimension_tag<2>> {
template<> struct Functors_without_division<Dimension_tag<2> > {
typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
};
template<> struct Functors_without_division<Dimension_tag<3>> {
template<> struct Functors_without_division<Dimension_tag<3> > {
typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
};
template<> struct Functors_without_division<Dimension_tag<4>> {
template<> struct Functors_without_division<Dimension_tag<4> > {
typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
};
template<> struct Functors_without_division<Dimension_tag<5>> {
template<> struct Functors_without_division<Dimension_tag<5> > {
typedef typeset<Orientation_of_points_tag, Side_of_oriented_sphere_tag> type;
};
template<> struct Functors_without_division<Dimension_tag<6>> {
template<> struct Functors_without_division<Dimension_tag<6> > {
typedef typeset<Orientation_of_points_tag> type;
};
@ -63,7 +63,7 @@ struct Cartesian_filter_K : public Base_,
typedef Base_ Kernel_base;
typedef AK_ AK;
typedef EK_ EK;
static_assert(internal::Do_not_store_kernel<AK>::value, "Only handle stateless kernels as AK");
CGAL_static_assertion_msg(internal::Do_not_store_kernel<AK>::value, "Only handle stateless kernels as AK");
AK approximate_kernel()const{return {};}
typedef typename Store_kernel<EK_>::reference_type EK_rt;
EK_rt exact_kernel()const{return this->Store_kernel<EK>::kernel();}

6
NewKernel_d/include/CGAL/typeset.h
View File

@ -88,8 +88,10 @@ namespace CGAL {
struct typeset<H,T>::add<H,V> : typeset<H,T> {};
struct typeset_all {
typedef typeset_all type;
template<class X> struct contains : public std::true_type {};
template<class X> struct add : public typeset_all {};
template<class X> struct contains : public boost::true_type {};
template<class X> struct add {
typedef typeset_all type;
};
};
#endif