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

use size_type of the graph in the edge property map class instead of std::size_t

This commit is contained in:
Andreas Fabri 2014-12-29 12:19:19 +01:00
parent cb62891f8e
commit 8fac52527d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
View File

@ -69,7 +69,7 @@ public:
OMesh_edge OMesh_edge
opposite_edge() const { return OMesh_edge(Halfedge_handle((halfedge_.idx() & 1) ? halfedge_.idx()-1 : halfedge_.idx()+1)); } opposite_edge() const { return OMesh_edge(Halfedge_handle((halfedge_.idx() & 1) ? halfedge_.idx()-1 : halfedge_.idx()+1)); }
std::size_t idx() const { return halfedge_.idx() / 2; } unsigned int idx() const { return halfedge_.idx() / 2; }
private: private:
Halfedge_handle halfedge_; Halfedge_handle halfedge_;
}; };

8
BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
View File

@ -53,12 +53,12 @@ private:
}; };
template <typename K, typename VEF> template <typename K, typename VEF>
class OM_index_pmap : public boost::put_get_helper<std::size_t, OM_index_pmap<K,VEF> > class OM_index_pmap : public boost::put_get_helper<unsigned int, OM_index_pmap<K,VEF> >
{ {
public: public:
typedef boost::readable_property_map_tag category; typedef boost::readable_property_map_tag category;
typedef std::size_t value_type; typedef unsigned int value_type;
typedef std::size_t reference; typedef unsigned int reference;
typedef VEF key_type; typedef VEF key_type;
value_type operator[](const key_type& vd) const value_type operator[](const key_type& vd) const
@ -113,7 +113,7 @@ public:
const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point(v,p); const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point(v,p);
#else #else
const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point const_cast<OpenMesh::PolyMesh_ArrayKernelT<K>&>(*pm.sm_).set_point
(v, typename OpenMesh::PolyMesh_ArrayKernelT<K>::Point(p[0], p[1], p[2])); (v, typename OpenMesh::PolyMesh_ArrayKernelT<K>::Point((float)p[0], (float)p[1], (float)p[2]));
#endif #endif
} }

6
BGL/include/CGAL/boost/graph/properties_Surface_mesh.h
View File

@ -63,12 +63,12 @@ private:
template <typename K, typename VEF> template <typename K, typename VEF>
class SM_index_pmap : public boost::put_get_helper<std::size_t, SM_index_pmap<K,VEF> > class SM_index_pmap : public boost::put_get_helper<int, SM_index_pmap<K,VEF> >
{ {
public: public:
typedef boost::readable_property_map_tag category; typedef boost::readable_property_map_tag category;
typedef std::size_t value_type; typedef int value_type;
typedef std::size_t reference; typedef int reference;
typedef VEF key_type; typedef VEF key_type;
value_type operator[](const key_type& vd) const value_type operator[](const key_type& vd) const