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

Remove macro CGAL_CONSTEXPR

This commit is contained in:
Marc Glisse 2019-02-08 15:23:35 +01:00
parent 16af3fcf81
commit c872a75e10
12 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -44,8 +44,8 @@ template<class Dim>
struct Epick_d_help1
: CGAL_BASE
{
CGAL_CONSTEXPR Epick_d_help1(){}
CGAL_CONSTEXPR Epick_d_help1(int d):CGAL_BASE(d){}
constexpr Epick_d_help1(){}
constexpr Epick_d_help1(int d):CGAL_BASE(d){}
};
#undef CGAL_BASE
#define CGAL_BASE \
@ -54,8 +54,8 @@ template<class Dim>
struct Epick_d_help2
: CGAL_BASE
{
CGAL_CONSTEXPR Epick_d_help2(){}
CGAL_CONSTEXPR Epick_d_help2(int d):CGAL_BASE(d){}
constexpr Epick_d_help2(){}
constexpr Epick_d_help2(int d):CGAL_BASE(d){}
};
#undef CGAL_BASE
#define CGAL_BASE \
@ -67,8 +67,8 @@ template<class Dim>
struct Epick_d
: CGAL_BASE
{
CGAL_CONSTEXPR Epick_d(){}
CGAL_CONSTEXPR Epick_d(int d):CGAL_BASE(d){}
constexpr Epick_d(){}
constexpr Epick_d(int d):CGAL_BASE(d){}
};
#undef CGAL_BASE
}

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

@ -170,8 +170,8 @@ struct Cartesian_LA_base_d : public Dimension_base<Dim_>
typedef CartesianDVectorBase::Identity_functor<Self> type;
};
CGAL_CONSTEXPR Cartesian_LA_base_d(){}
CGAL_CONSTEXPR Cartesian_LA_base_d(int d):Dimension_base<Dim_>(d){}
constexpr Cartesian_LA_base_d(){}
constexpr Cartesian_LA_base_d(int d):Dimension_base<Dim_>(d){}
};
} //namespace CGAL

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

@ -31,8 +31,8 @@ namespace CGAL {
template < typename FT_, typename Dim_, typename Derived_=Default>
struct Cartesian_base_d : public CGAL_BASE
{
CGAL_CONSTEXPR Cartesian_base_d(){}
CGAL_CONSTEXPR Cartesian_base_d(int d):CGAL_BASE(d){}
constexpr Cartesian_base_d(){}
constexpr Cartesian_base_d(int d):CGAL_BASE(d){}
};
#undef CGAL_BASE

8
NewKernel_d/include/CGAL/NewKernel_d/Cartesian_change_FT.h
View File

@ -32,8 +32,8 @@ template < typename Base_, typename FT_, typename LA_=CGAL::LA_eigen<FT_,typenam
struct Cartesian_change_FT_base : public
Base_
{
CGAL_CONSTEXPR Cartesian_change_FT_base(){}
CGAL_CONSTEXPR Cartesian_change_FT_base(int d):Base_(d){}
constexpr Cartesian_change_FT_base(){}
constexpr Cartesian_change_FT_base(int d):Base_(d){}
typedef Cartesian_change_FT_base Self;
typedef Base_ Kernel_base;
@ -109,8 +109,8 @@ template < typename Base_, typename FT_>
struct Cartesian_change_FT : public
Cartesian_change_FT_base<Base_,FT_>
{
CGAL_CONSTEXPR Cartesian_change_FT(){}
CGAL_CONSTEXPR Cartesian_change_FT(int d):Cartesian_change_FT_base<Base_,FT_>(d){}
constexpr Cartesian_change_FT(){}
constexpr Cartesian_change_FT(int d):Cartesian_change_FT_base<Base_,FT_>(d){}
};
} //namespace CGAL

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

@ -33,12 +33,12 @@ template < typename Base_, typename AK_, typename EK_ >
struct Cartesian_filter_K : public Base_,
private Store_kernel<AK_>, private Store_kernel2<EK_>
{
CGAL_CONSTEXPR Cartesian_filter_K(){}
CGAL_CONSTEXPR Cartesian_filter_K(int d):Base_(d){}
constexpr Cartesian_filter_K(){}
constexpr Cartesian_filter_K(int d):Base_(d){}
//FIXME: or do we want an instance of AK and EK belonging to this kernel,
//instead of a reference to external ones?
CGAL_CONSTEXPR Cartesian_filter_K(AK_ const&a,EK_ const&b):Base_(),Store_kernel<AK_>(a),Store_kernel2<EK_>(b){}
CGAL_CONSTEXPR Cartesian_filter_K(int d,AK_ const&a,EK_ const&b):Base_(d),Store_kernel<AK_>(a),Store_kernel2<EK_>(b){}
constexpr Cartesian_filter_K(AK_ const&a,EK_ const&b):Base_(),Store_kernel<AK_>(a),Store_kernel2<EK_>(b){}
constexpr Cartesian_filter_K(int d,AK_ const&a,EK_ const&b):Base_(d),Store_kernel<AK_>(a),Store_kernel2<EK_>(b){}
typedef Base_ Kernel_base;
typedef AK_ AK;
typedef EK_ EK;

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

@ -30,8 +30,8 @@ namespace CGAL {
template < typename Base_ >
struct Cartesian_filter_NT : public Base_
{
CGAL_CONSTEXPR Cartesian_filter_NT(){}
CGAL_CONSTEXPR Cartesian_filter_NT(int d):Base_(d){}
constexpr Cartesian_filter_NT(){}
constexpr Cartesian_filter_NT(int d):Base_(d){}
typedef Base_ Kernel_base;
typedef Cartesian_change_FT<Kernel_base,Interval_nt_advanced> K1;
typedef typename internal::Exact_field_selector<typename Get_type<Kernel_base, FT_tag>::type>::Type Exact_nt;

8
NewKernel_d/include/CGAL/NewKernel_d/Cartesian_static_filters.h
View File

@ -69,14 +69,14 @@ template <class Base_,class R_> struct Orientation_of_points_2 : private Store_k
template <class Dim_ /* should be implicit */, class R_, class Derived_=Default>
struct Cartesian_static_filters : public R_ {
CGAL_CONSTEXPR Cartesian_static_filters(){}
CGAL_CONSTEXPR Cartesian_static_filters(int d):R_(d){}
constexpr Cartesian_static_filters(){}
constexpr Cartesian_static_filters(int d):R_(d){}
};
template <class R_, class Derived_>
struct Cartesian_static_filters<Dimension_tag<2>, R_, Derived_> : public R_ {
CGAL_CONSTEXPR Cartesian_static_filters(){}
CGAL_CONSTEXPR Cartesian_static_filters(int d):R_(d){}
constexpr Cartesian_static_filters(){}
constexpr Cartesian_static_filters(int d):R_(d){}
typedef Cartesian_static_filters<Dimension_tag<2>, R_, Derived_> Self;
typedef typename Default::Get<Derived_,Self>::type Derived;
template <class T, class=void> struct Functor : Inherit_functor<R_, T> {};

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

@ -29,8 +29,8 @@
namespace CGAL {
template <class Base_> struct Kernel_d_interface : public Base_ {
CGAL_CONSTEXPR Kernel_d_interface(){}
CGAL_CONSTEXPR Kernel_d_interface(int d):Base_(d){}
constexpr Kernel_d_interface(){}
constexpr Kernel_d_interface(int d):Base_(d){}
typedef Base_ Base;
typedef Kernel_d_interface<Base> Kernel;

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

@ -148,8 +148,8 @@ template <class EK_, class AK_, class E2A_/*, class Kernel_=Default*/>
struct Lazy_cartesian :
Lazy_cartesian_types<EK_,AK_,E2A_,Lazy_cartesian<EK_,AK_,E2A_> >
{
CGAL_CONSTEXPR Lazy_cartesian(){}
CGAL_CONSTEXPR Lazy_cartesian(int d):ak(d),ek(d){}
constexpr Lazy_cartesian(){}
constexpr Lazy_cartesian(int d):ak(d),ek(d){}
//TODO: Do we want to store an AK and an EK? Or just references?
//FIXME: references would be better I guess.

8
NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Cartesian_wrap.h
View File

@ -122,8 +122,8 @@ CGAL_REGISTER_OBJECT_WRAPPER(Weighted_point);
template < typename Base_ , typename Derived_ = Default >
struct Cartesian_wrap : public Base_
{
CGAL_CONSTEXPR Cartesian_wrap(){}
CGAL_CONSTEXPR Cartesian_wrap(int d):Base_(d){}
constexpr Cartesian_wrap(){}
constexpr Cartesian_wrap(int d):Base_(d){}
typedef Base_ Kernel_base;
typedef Cartesian_wrap Self;
// TODO: pass the 2 types Self and Derived to the wrappers, they can use Self for most purposes and Derived only for Kernel_traits' typedef R.
@ -178,8 +178,8 @@ struct Cartesian_wrap : public Base_
template < typename Base_ >
struct Cartesian_refcount : public Base_
{
CGAL_CONSTEXPR Cartesian_refcount(){}
CGAL_CONSTEXPR Cartesian_refcount(int d):Base_(d){}
constexpr Cartesian_refcount(){}
constexpr Cartesian_refcount(int d):Base_(d){}
typedef Base_ Kernel_base;
typedef Cartesian_refcount Self;

1
NewKernel_d/include/CGAL/NewKernel_d/utils.h
View File

@ -34,7 +34,6 @@
#define CGAL_FORWARDABLE(T) T&&
#define CGAL_FORWARD(T,t) std::forward<T>(t)
#define CGAL_MOVE(t) std::move(t)
#define CGAL_CONSTEXPR constexpr
#include <boost/utility/enable_if.hpp>
#include <boost/preprocessor/repetition.hpp>
#include <CGAL/Rational_traits.h>