mirror of https://github.com/CGAL/cgal
do not use tie when not needed
This commit is contained in:
parent
107f3696dc
commit
4737f58130
|
|
@ -317,9 +317,8 @@ private:
|
||||||
Point ref (std::floor(p.x() / voxel_size),
|
Point ref (std::floor(p.x() / voxel_size),
|
||||||
std::floor(p.y() / voxel_size),
|
std::floor(p.y() / voxel_size),
|
||||||
std::floor(p.z() / voxel_size));
|
std::floor(p.z() / voxel_size));
|
||||||
typename std::map<Point, std::vector<std::uint32_t> >::iterator it;
|
typename std::map<Point, std::vector<std::uint32_t> >::iterator it
|
||||||
std::tie (it, boost::tuples::ignore)
|
= grid.insert (std::make_pair (ref, std::vector<std::uint32_t>())).first;
|
||||||
= grid.insert (std::make_pair (ref, std::vector<std::uint32_t>()));
|
|
||||||
it->second.push_back (i);
|
it->second.push_back (i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -409,21 +409,15 @@ public:
|
||||||
{
|
{
|
||||||
if (other.template has_property_map<unsigned char>("red"))
|
if (other.template has_property_map<unsigned char>("red"))
|
||||||
{
|
{
|
||||||
std::tie (m_red, boost::tuples::ignore)
|
m_red = this->template add_property_map<unsigned char>("red", 0).first;
|
||||||
= this->template add_property_map<unsigned char>("red", 0);
|
m_green = this->template add_property_map<unsigned char>("green", 0).first;
|
||||||
std::tie (m_green, boost::tuples::ignore)
|
m_blue = this->template add_property_map<unsigned char>("blue", 0).first;
|
||||||
= this->template add_property_map<unsigned char>("green", 0);
|
|
||||||
std::tie (m_blue, boost::tuples::ignore)
|
|
||||||
= this->template add_property_map<unsigned char>("blue", 0);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::tie (m_red, boost::tuples::ignore)
|
m_red = this->template add_property_map<unsigned char>("r", 0).first;
|
||||||
= this->template add_property_map<unsigned char>("r", 0);
|
m_green = this->template add_property_map<unsigned char>("g", 0).first;
|
||||||
std::tie (m_green, boost::tuples::ignore)
|
m_blue = this->template add_property_map<unsigned char>("b", 0).first;
|
||||||
= this->template add_property_map<unsigned char>("g", 0);
|
|
||||||
std::tie (m_blue, boost::tuples::ignore)
|
|
||||||
= this->template add_property_map<unsigned char>("b", 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ private:
|
||||||
PLY_property_to_point_set_property(Point_set& ps, const std::string& name)
|
PLY_property_to_point_set_property(Point_set& ps, const std::string& name)
|
||||||
: m_name(name)
|
: m_name(name)
|
||||||
{
|
{
|
||||||
std::tie(m_map, boost::tuples::ignore) = ps.add_property_map(name, Type());
|
m_map = ps.add_property_map(name, Type()).first;
|
||||||
m_pmap = ps.push_property_map(m_map);
|
m_pmap = ps.push_property_map(m_map);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue