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

Use CGAL_USE_LONG_LONG instead of a plain removal

This commit is contained in:
Andreas Fabri 2008-11-21 10:11:44 +00:00
parent 2344345b11
commit 3c07f1bf21
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Algebraic_foundations/include/CGAL/Coercion_traits.h
View File

@ -159,25 +159,33 @@ template<class A , class B, int > struct Coercion_traits_for_level;
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,int) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,int)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long)
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long long) #ifdef CGAL_USE_LONG_LONG
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long long)
#endif
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,float) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,float)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long)
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long long) #ifdef CGAL_USE_LONG_LONG
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long long)
#endif
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,float) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,float)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long double)
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long long) #ifdef CGAL_USE_LONG_LONG
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long long)
#endif
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,float) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,float)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long double)
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,float) #ifdef CGAL_USE_LONG_LONG
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,float)
//CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,long double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,long double)
#endif
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,double)
CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,long double) CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,long double)
@ -201,7 +209,9 @@ struct Coercion_traits<A,A>{
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(short) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(short)
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(int) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(int)
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long)
//CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long long) #ifdef CGAL_USE_LONG_LONG
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long long)
#endif
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(float) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(float)
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(double) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(double)
CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long double) CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long double)

8
Algebraic_foundations/include/CGAL/Needs_parens_as_product.h
View File

@ -81,9 +81,11 @@ template <> struct Needs_parens_as_product<long>{
bool operator()(const long& x){return x < long(0);} bool operator()(const long& x){return x < long(0);}
}; };
//template <> struct Needs_parens_as_product<long long>{ #ifdef CGAL_USE_LONG_LONG
// bool operator()(const long long& x){return x < (long long)(0);} template <> struct Needs_parens_as_product<long long>{
//}; bool operator()(const long long& x){return x < (long long)(0);}
};
#endif
template <> struct Needs_parens_as_product<float>{ template <> struct Needs_parens_as_product<float>{
bool operator()(const float& x){return x < float(0);} bool operator()(const float& x){return x < float(0);}