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

fix for auto and Intel compiler

This commit is contained in:
Andreas Fabri 2016-09-22 09:54:17 +02:00 committed by Laurent Rineau
parent 51912a8913
commit 8d15be6c59
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
View File

@ -1161,14 +1161,17 @@ template<class R_> struct Compare_lexicographically : private Store_kernel<R_> {
template<class V,class W> template<class V,class W>
result_type operator()(V const&a, W const&b)const{ result_type operator()(V const&a, W const&b)const{
CI c(this->kernel()); CI c(this->kernel());
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
auto auto a_begin=c(a,Begin_tag());
auto b_begin=c(b,Begin_tag());
auto a_end=c(a,End_tag());
#else #else
typename CI::result_type typename CI::result_type a_begin=c(a,Begin_tag());
typename CI::result_type b_begin=c(b,Begin_tag());
typename CI::result_type a_end=c(a,End_tag());
#endif #endif
a_begin=c(a,Begin_tag()),
b_begin=c(b,Begin_tag()),
a_end=c(a,End_tag());
result_type res; result_type res;
// can't we do slightly better for Uncertain<*> ? // can't we do slightly better for Uncertain<*> ?
// after res=...; if(is_uncertain(res))return indeterminate<result_type>(); // after res=...; if(is_uncertain(res))return indeterminate<result_type>();
@ -1230,14 +1233,18 @@ template<class R_> struct Equal_points : private Store_kernel<R_> {
template<class V,class W> template<class V,class W>
result_type operator()(V const&a, W const&b)const{ result_type operator()(V const&a, W const&b)const{
CI c(this->kernel()); CI c(this->kernel());
#ifdef CGAL_CXX11 #ifdef CGAL_CXX11
auto auto a_begin=c(a,Begin_tag());
auto b_begin=c(b,Begin_tag());
auto a_end=c(a,End_tag());
#else #else
typename CI::result_type typename CI::result_type a_begin=c(a,Begin_tag());
typename CI::result_type b_begin=c(b,Begin_tag());
typename CI::result_type a_end=c(a,End_tag());
#endif #endif
a_begin=c(a,Begin_tag()),
b_begin=c(b,Begin_tag()),
a_end=c(a,End_tag());
result_type res = true; result_type res = true;
// Is using CGAL::possibly for Uncertain really an optimization? // Is using CGAL::possibly for Uncertain really an optimization?
do res = res & (*a_begin++ == *b_begin++); do res = res & (*a_begin++ == *b_begin++);