@@ -330,8 +330,8 @@ class Point_set_3
330
330
void clear ()
331
331
{
332
332
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 ;
335
335
m_nb_removed = 0 ;
336
336
}
337
337
@@ -345,12 +345,12 @@ class Point_set_3
345
345
{
346
346
Base other;
347
347
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 );
349
349
other.resize (m_base.size ());
350
350
other.transfer (m_base);
351
351
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 ;
354
354
}
355
355
356
356
/* !
@@ -799,7 +799,7 @@ class Point_set_3
799
799
{
800
800
Property_map<T> pm;
801
801
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);
803
803
return std::make_pair (pm, added);
804
804
}
805
805
@@ -820,7 +820,7 @@ class Point_set_3
820
820
{
821
821
Property_map<T> pm;
822
822
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);
824
824
return std::make_pair (pm, okay);
825
825
}
826
826
@@ -861,10 +861,10 @@ class Point_set_3
861
861
that is `true` if the property was added and `false` if it already
862
862
exists (and was therefore not added but only returned).
863
863
*/
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 )
865
865
{
866
866
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);
868
868
return std::make_pair (m_normals, out);
869
869
}
870
870
/* !
0 commit comments