Skip to content

Commit 589eb8c

Browse files
committed
Fix warnings with float kernel
1 parent 9d3b16e commit 589eb8c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Point_set_3/include/CGAL/Point_set_3.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ class Point_set_3
330330
void clear()
331331
{
332332
m_base.clear();
333-
boost::tie (m_indices, boost::tuples::ignore) = this->add_property_map<Index>("index", typename Index::size_type(-1));
334-
boost::tie (m_points, boost::tuples::ignore) = this->add_property_map<Point>("point", Point (0., 0., 0.));
333+
m_indices = this->add_property_map<Index>("index", typename Index::size_type(-1)).first;
334+
m_points = this->add_property_map<Point>("point", CGAL::ORIGIN).first;
335335
m_nb_removed = 0;
336336
}
337337

@@ -345,12 +345,12 @@ class Point_set_3
345345
{
346346
Base other;
347347
other.template add<Index>("index", typename Index::size_type(-1));
348-
other.template add<Point>("point", Point (0., 0., 0.));
348+
other.template add<Point>("point", CGAL::ORIGIN);
349349
other.resize(m_base.size());
350350
other.transfer(m_base);
351351
m_base.swap(other);
352-
boost::tie (m_indices, boost::tuples::ignore) = this->property_map<Index>("index");
353-
boost::tie (m_points, boost::tuples::ignore) = this->property_map<Point>("point");
352+
m_indices = this->property_map<Index>("index").first;
353+
m_points = this->property_map<Point>("point").first;
354354
}
355355

356356
/*!
@@ -799,7 +799,7 @@ class Point_set_3
799799
{
800800
Property_map<T> pm;
801801
bool added = false;
802-
boost::tie (pm, added) = m_base.template add<T> (name, t);
802+
std::tie (pm, added) = m_base.template add<T> (name, t);
803803
return std::make_pair (pm, added);
804804
}
805805

@@ -820,7 +820,7 @@ class Point_set_3
820820
{
821821
Property_map<T> pm;
822822
bool okay = false;
823-
boost::tie (pm, okay) = m_base.template get<T>(name);
823+
std::tie (pm, okay) = m_base.template get<T>(name);
824824
return std::make_pair (pm, okay);
825825
}
826826

@@ -861,10 +861,10 @@ class Point_set_3
861861
that is `true` if the property was added and `false` if it already
862862
exists (and was therefore not added but only returned).
863863
*/
864-
std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = Vector(0., 0., 0.))
864+
std::pair<Vector_map, bool> add_normal_map (const Vector& default_value = CGAL::NULL_VECTOR)
865865
{
866866
bool out = false;
867-
boost::tie (m_normals, out) = this->add_property_map<Vector> ("normal", default_value);
867+
std::tie (m_normals, out) = this->add_property_map<Vector> ("normal", default_value);
868868
return std::make_pair (m_normals, out);
869869
}
870870
/*!

0 commit comments

Comments
 (0)