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

WIP

This commit is contained in:
Maxime Gimeno 2020-07-16 14:47:41 +02:00
parent d303009496
commit 41175cd505
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CGAL_Core/include/CGAL/CORE/Filter.h
View File

@ -164,7 +164,8 @@ public:
double maxVal = ( core_abs(val) + maxAbs / x.maxAbs) / xxx + DBL_MIN; double maxVal = ( core_abs(val) + maxAbs / x.maxAbs) / xxx + DBL_MIN;
return filteredFp(val, maxVal, 1 + core_max(ind, x.ind + 1)); return filteredFp(val, maxVal, 1 + core_max(ind, x.ind + 1));
} else } else
return filteredFp( std::nan(""), getDoubleInfty(), 1); //TODO: check that
return filteredFp( std::strtod("NAN", (char**)NULL), getDoubleInfty(), 1);
} }
/// square root /// square root
filteredFp sqrt () const { filteredFp sqrt () const {

6
Point_set_3/include/CGAL/Point_set_3.h
View File

@ -799,7 +799,7 @@ public:
{ {
Property_map<T> pm; Property_map<T> pm;
bool added = false; bool added = false;
std::tie (pm, added) = m_base.template add<T> (name, t); boost::tie (pm, added) = m_base.template add<T> (name, t);
return std::make_pair (pm, added); return std::make_pair (pm, added);
} }
@ -820,7 +820,7 @@ public:
{ {
Property_map<T> pm; Property_map<T> pm;
bool okay = false; bool okay = false;
std::tie (pm, okay) = m_base.template get<T>(name); boost::tie (pm, okay) = m_base.template get<T>(name);
return std::make_pair (pm, okay); return std::make_pair (pm, okay);
} }
@ -864,7 +864,7 @@ public:
std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = CGAL::NULL_VECTOR) std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = CGAL::NULL_VECTOR)
{ {
bool out = false; bool out = false;
std::tie (m_normals, out) = this->add_property_map<Vector> ("normal", default_value); boost::tie (m_normals, out) = this->add_property_map<Vector> ("normal", default_value);
return std::make_pair (m_normals, out); return std::make_pair (m_normals, out);
} }
/*! /*!

2
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -555,7 +555,7 @@ protected:
public: public:
template<typename P> // Point or Point_3 template<typename P> // Point or Point_3
typename boost::result_of<const Construct_point_3(const P&)>::type Point_3
construct_point(const P& p) const construct_point(const P& p) const
{ {
return geom_traits().construct_point_3_object()(p); return geom_traits().construct_point_3_object()(p);