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

Fix put(Dynamic_property_map&..)

This commit is contained in:
Andreas Fabri 2017-10-06 09:41:36 +01:00 committed by Jane Tournois
parent bfb8d1fcc6
commit d2425251bf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Property_map/include/CGAL/Dynamic_property_map.h
View File

@ -49,22 +49,20 @@ struct Dynamic_property_map {
}
}
friend reference get(const Dynamic_property_map& m, const key_type& k)
friend value_type get(const Dynamic_property_map& m, const key_type& k)
{
typename Map::const_iterator it = m.map_->find(k);
if(it == m.map_->end()){
(*(const_cast<Dynamic_property_map&>(m).map_))[k] = m.default_value();
return m.default_value();
}
return it->second;
}
friend void put(Dynamic_property_map& m, const key_type& k, const value_type& v)
friend void put(const Dynamic_property_map& m, const key_type& k, const value_type& v)
{
if(v != m.default_value()){
(*(m.map_))[k] = v;
}
(*(m.map_))[k] = v;
}
@ -191,7 +189,7 @@ add_property(face_property_t<T> prop, const G&)
return internal::Dynamic_property_map<face_descriptor,T>(prop.t);
}
template<class G, class T, typename Descriptor>
template<typename G, typename Descriptor, typename T>
void remove_property(
internal::Dynamic_property_map<Descriptor, T> pm,
const G&)