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

Merge pull request #6169 from sloriot/PM-public_typdefs 

Fix Or_pmap
This commit is contained in:
Laurent Rineau 2021-12-20 18:05:46 +01:00
parent b22ae981e9 1d36ae1a57
commit a07c06abd0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Property_map/include/CGAL/property_map.h
View File

@ -40,15 +40,13 @@ namespace CGAL {
/// A boolean property map return a const value at compile time /// A boolean property map return a const value at compile time
template <typename Key, bool default_value> template <typename Key, bool default_value>
class Static_boolean_property_map struct Static_boolean_property_map
{ {
public:
typedef Key key_type; typedef Key key_type;
typedef bool value_type; typedef bool value_type;
typedef bool reference; typedef bool reference;
typedef boost::read_write_property_map_tag category; typedef boost::read_write_property_map_tag category;
public:
inline friend inline friend
value_type value_type
get(Static_boolean_property_map, const key_type&) get(Static_boolean_property_map, const key_type&)
@ -65,15 +63,16 @@ public:
template <typename PM1, typename PM2> template <typename PM1, typename PM2>
class OR_property_map { class OR_property_map {
PM1 pm1;
PM2 pm2;
public:
typedef typename PM1::key_type key_type; typedef typename PM1::key_type key_type;
typedef typename PM1::value_type value_type; typedef typename PM1::value_type value_type;
typedef typename PM1::reference reference; typedef typename PM1::reference reference;
typedef boost::read_write_property_map_tag category; typedef boost::read_write_property_map_tag category;
PM1 pm1;
PM2 pm2;
public:
OR_property_map() {} // required by boost::connected_components OR_property_map() {} // required by boost::connected_components
OR_property_map(PM1 pm1, PM2 pm2) OR_property_map(PM1 pm1, PM2 pm2)