Removed unary_function from hash

This commit is contained in:
Jan Möbius
2018-04-16 10:03:10 +02:00
parent 8396dceab1
commit b135803c86

View File

@@ -165,8 +165,9 @@ namespace std {
template <> template <>
struct hash<OpenMesh::BaseHandle > struct hash<OpenMesh::BaseHandle >
: public std::unary_function<OpenMesh::BaseHandle, std::size_t>
{ {
typedef OpenMesh::BaseHandle argument_type;
typedef std::size_t result_type;
std::size_t operator()(const OpenMesh::BaseHandle& h) const std::size_t operator()(const OpenMesh::BaseHandle& h) const
{ {
@@ -176,8 +177,9 @@ struct hash<OpenMesh::BaseHandle >
template <> template <>
struct hash<OpenMesh::VertexHandle > struct hash<OpenMesh::VertexHandle >
: public std::unary_function<OpenMesh::VertexHandle, std::size_t>
{ {
typedef OpenMesh::VertexHandle argument_type;
typedef std::size_t result_type;
std::size_t operator()(const OpenMesh::VertexHandle& h) const std::size_t operator()(const OpenMesh::VertexHandle& h) const
{ {
@@ -187,9 +189,11 @@ struct hash<OpenMesh::VertexHandle >
template <> template <>
struct hash<OpenMesh::HalfedgeHandle > struct hash<OpenMesh::HalfedgeHandle >
: public std::unary_function<OpenMesh::HalfedgeHandle, std::size_t>
{ {
typedef OpenMesh::HalfedgeHandle argument_type;
typedef std::size_t result_type;
std::size_t operator()(const OpenMesh::HalfedgeHandle& h) const std::size_t operator()(const OpenMesh::HalfedgeHandle& h) const
{ {
return h.idx(); return h.idx();
@@ -198,9 +202,11 @@ struct hash<OpenMesh::HalfedgeHandle >
template <> template <>
struct hash<OpenMesh::EdgeHandle > struct hash<OpenMesh::EdgeHandle >
: public std::unary_function<OpenMesh::EdgeHandle, std::size_t>
{ {
typedef OpenMesh::EdgeHandle argument_type;
typedef std::size_t result_type;
std::size_t operator()(const OpenMesh::EdgeHandle& h) const std::size_t operator()(const OpenMesh::EdgeHandle& h) const
{ {
return h.idx(); return h.idx();
@@ -209,9 +215,11 @@ struct hash<OpenMesh::EdgeHandle >
template <> template <>
struct hash<OpenMesh::FaceHandle > struct hash<OpenMesh::FaceHandle >
: public std::unary_function<OpenMesh::FaceHandle, std::size_t>
{ {
typedef OpenMesh::FaceHandle argument_type;
typedef std::size_t result_type;
std::size_t operator()(const OpenMesh::FaceHandle& h) const std::size_t operator()(const OpenMesh::FaceHandle& h) const
{ {
return h.idx(); return h.idx();