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

Fix the specialization of Boost's assoc_pmap using CGAL::Unique_hash_map 

The default template parameters of the hash map were taken.
This commit is contained in:
Mael Rouxel-Labbé 2016-10-21 17:52:44 +02:00
parent 0f97115ce8
commit 3016548bad
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Hash_map/include/CGAL/Unique_hash_map.h
View File

@ -129,10 +129,13 @@ namespace boost {
struct lvalue_property_map_tag; struct lvalue_property_map_tag;
template <typename KeyType, typename ValueType> template <typename KeyType, typename ValueType,
class associative_property_map<CGAL::Unique_hash_map<KeyType,ValueType> > typename HashFunction, typename Allocator>
class associative_property_map<CGAL::Unique_hash_map<KeyType, ValueType,
HashFunction, Allocator> >
{ {
typedef CGAL::Unique_hash_map<KeyType,ValueType> C; typedef CGAL::Unique_hash_map<KeyType, ValueType, HashFunction, Allocator> C;
public: public:
typedef KeyType key_type; typedef KeyType key_type;
typedef ValueType value_type; typedef ValueType value_type;
@ -146,16 +149,14 @@ namespace boost {
friend friend
const value_type& const value_type&
get(const associative_property_map<CGAL::Unique_hash_map<KeyType,ValueType> >& uhm, get(const associative_property_map<C>& uhm, const key_type& key)
const key_type& key)
{ {
return uhm[key]; return uhm[key];
} }
friend friend
void void
put(associative_property_map<CGAL::Unique_hash_map<KeyType,ValueType> >& uhm, put(associative_property_map<C>& uhm, const key_type& key, const value_type& val)
const key_type& key, const value_type& val)
{ {
uhm[key] = val; uhm[key] = val;
} }
@ -164,18 +165,18 @@ namespace boost {
C* m_c; C* m_c;
}; };
template <typename KeyType, typename ValueType,
template <typename KeyType, typename ValueType> typename HashFunction, typename Allocator>
associative_property_map<CGAL::Unique_hash_map<KeyType,ValueType> > associative_property_map<CGAL::Unique_hash_map<KeyType, ValueType,
make_assoc_property_map(CGAL::Unique_hash_map<KeyType,ValueType> & c) HashFunction, Allocator> >
make_assoc_property_map(CGAL::Unique_hash_map<KeyType, ValueType,
HashFunction, Allocator>& c)
{ {
return associative_property_map<CGAL::Unique_hash_map<KeyType,ValueType> >(c); return associative_property_map<CGAL::Unique_hash_map<KeyType, ValueType,
HashFunction, Allocator> >(c);
} }
} }
#endif // CGAL_UNIQUE_HASH_MAP_H #endif // CGAL_UNIQUE_HASH_MAP_H
// EOF // EOF