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

Fix warnings with float kernel

This commit is contained in:
Simon Giraudot 2020-04-16 09:16:52 +02:00
parent 9d3b16edf4
commit 589eb8c01f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,8 +330,8 @@ public:
void clear() void clear()
{ {
m_base.clear(); m_base.clear();
boost::tie (m_indices, boost::tuples::ignore) = this->add_property_map<Index>("index", typename Index::size_type(-1)); m_indices = this->add_property_map<Index>("index", typename Index::size_type(-1)).first;
boost::tie (m_points, boost::tuples::ignore) = this->add_property_map<Point>("point", Point (0., 0., 0.)); m_points = this->add_property_map<Point>("point", CGAL::ORIGIN).first;
m_nb_removed = 0; m_nb_removed = 0;
} }
@ -345,12 +345,12 @@ public:
{ {
Base other; Base other;
other.template add<Index>("index", typename Index::size_type(-1)); other.template add<Index>("index", typename Index::size_type(-1));
other.template add<Point>("point", Point (0., 0., 0.)); other.template add<Point>("point", CGAL::ORIGIN);
other.resize(m_base.size()); other.resize(m_base.size());
other.transfer(m_base); other.transfer(m_base);
m_base.swap(other); m_base.swap(other);
boost::tie (m_indices, boost::tuples::ignore) = this->property_map<Index>("index"); m_indices = this->property_map<Index>("index").first;
boost::tie (m_points, boost::tuples::ignore) = this->property_map<Point>("point"); m_points = this->property_map<Point>("point").first;
} }
/*! /*!
@ -799,7 +799,7 @@ public:
{ {
Property_map<T> pm; Property_map<T> pm;
bool added = false; bool added = false;
boost::tie (pm, added) = m_base.template add<T> (name, t); std::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;
boost::tie (pm, okay) = m_base.template get<T>(name); std::tie (pm, okay) = m_base.template get<T>(name);
return std::make_pair (pm, okay); return std::make_pair (pm, okay);
} }
@ -861,10 +861,10 @@ public:
that is `true` if the property was added and `false` if it already that is `true` if the property was added and `false` if it already
exists (and was therefore not added but only returned). exists (and was therefore not added but only returned).
*/ */
std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = Vector(0., 0., 0.)) std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = CGAL::NULL_VECTOR)
{ {
bool out = false; bool out = false;
boost::tie (m_normals, out) = this->add_property_map<Vector> ("normal", default_value); std::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);
} }
/*! /*!