From 589eb8c01fc1a32011d2cae4ef0cb44fa2218c83 Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 16 Apr 2020 09:16:52 +0200 Subject: [PATCH] Fix warnings with float kernel --- Point_set_3/include/CGAL/Point_set_3.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Point_set_3/include/CGAL/Point_set_3.h b/Point_set_3/include/CGAL/Point_set_3.h index 14bc9e0ca44..7285d39c587 100644 --- a/Point_set_3/include/CGAL/Point_set_3.h +++ b/Point_set_3/include/CGAL/Point_set_3.h @@ -330,8 +330,8 @@ public: void clear() { m_base.clear(); - boost::tie (m_indices, boost::tuples::ignore) = this->add_property_map("index", typename Index::size_type(-1)); - boost::tie (m_points, boost::tuples::ignore) = this->add_property_map("point", Point (0., 0., 0.)); + m_indices = this->add_property_map("index", typename Index::size_type(-1)).first; + m_points = this->add_property_map("point", CGAL::ORIGIN).first; m_nb_removed = 0; } @@ -345,12 +345,12 @@ public: { Base other; other.template add("index", typename Index::size_type(-1)); - other.template add("point", Point (0., 0., 0.)); + other.template add("point", CGAL::ORIGIN); other.resize(m_base.size()); other.transfer(m_base); m_base.swap(other); - boost::tie (m_indices, boost::tuples::ignore) = this->property_map("index"); - boost::tie (m_points, boost::tuples::ignore) = this->property_map("point"); + m_indices = this->property_map("index").first; + m_points = this->property_map("point").first; } /*! @@ -799,7 +799,7 @@ public: { Property_map pm; bool added = false; - boost::tie (pm, added) = m_base.template add (name, t); + std::tie (pm, added) = m_base.template add (name, t); return std::make_pair (pm, added); } @@ -820,7 +820,7 @@ public: { Property_map pm; bool okay = false; - boost::tie (pm, okay) = m_base.template get(name); + std::tie (pm, okay) = m_base.template get(name); return std::make_pair (pm, okay); } @@ -861,10 +861,10 @@ public: that is `true` if the property was added and `false` if it already exists (and was therefore not added but only returned). */ - std::pair add_normal_map (const Vector& default_value = Vector(0., 0., 0.)) + std::pair add_normal_map (const Vector& default_value = CGAL::NULL_VECTOR) { bool out = false; - boost::tie (m_normals, out) = this->add_property_map ("normal", default_value); + std::tie (m_normals, out) = this->add_property_map ("normal", default_value); return std::make_pair (m_normals, out); } /*!