From 26de0fbb0565b51362fc03a3d4eb4f51a306856d Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Mon, 29 Aug 2016 23:25:06 +0200
Subject: [PATCH 1/2] hash_value is not defined inside an #ifdef OM_HAS_HASH

---
 STL_Extension/include/CGAL/hash_openmesh.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/STL_Extension/include/CGAL/hash_openmesh.h b/STL_Extension/include/CGAL/hash_openmesh.h
index 49b0d1278f3..0efbff824c8 100644
--- a/STL_Extension/include/CGAL/hash_openmesh.h
+++ b/STL_Extension/include/CGAL/hash_openmesh.h
@@ -22,15 +22,20 @@
 
 #include <OpenMesh/Core/Mesh/Handles.hh>
 
-#ifndef OM_HAS_HASH
-
-#include <functional>
+#if OMVERSION < 0x60200
 
 namespace OpenMesh {
 
 inline std::size_t hash_value(const BaseHandle& h) { return h.idx(); }
 
 } // namespace OpenMesh
+#endif
+
+
+#ifndef OM_HAS_HASH
+
+#include <functional>
+
 
 namespace std {
 

From ad2ec90426f68e08cdd173310ab1dfafc2d808f8 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Tue, 30 Aug 2016 10:15:15 +0200
Subject: [PATCH 2/2]  typo

---
 STL_Extension/include/CGAL/hash_openmesh.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/STL_Extension/include/CGAL/hash_openmesh.h b/STL_Extension/include/CGAL/hash_openmesh.h
index 0efbff824c8..7d12891a62c 100644
--- a/STL_Extension/include/CGAL/hash_openmesh.h
+++ b/STL_Extension/include/CGAL/hash_openmesh.h
@@ -22,7 +22,7 @@
 
 #include <OpenMesh/Core/Mesh/Handles.hh>
 
-#if OMVERSION < 0x60200
+#if OM_VERSION < 0x60200
 
 namespace OpenMesh {