Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh

src/OpenMesh/Core/Mesh/ArrayKernel.hh

@@ -444,15 +444,23 @@ public:
   { return next_halfedge_handle(opposite_halfedge_handle(_heh)); }
 
   // --- edge connectivity ---
-  HalfedgeHandle halfedge_handle(EdgeHandle _eh, unsigned int _i) const
+  static HalfedgeHandle s_halfedge_handle(EdgeHandle _eh, unsigned int _i)
   {
     assert(_i<=1);
     return HalfedgeHandle((_eh.idx() << 1) + _i);
   }
 
-  EdgeHandle edge_handle(HalfedgeHandle _heh) const
+  static EdgeHandle s_edge_handle(HalfedgeHandle _heh)
   { return EdgeHandle(_heh.idx() >> 1); }
 
+  HalfedgeHandle halfedge_handle(EdgeHandle _eh, unsigned int _i) const
+  {
+      return s_halfedge_handle(_eh, _i);
+  }
+
+  EdgeHandle edge_handle(HalfedgeHandle _heh) const
+  { return s_edge_handle(_heh); }
+
   // --- face connectivity ---
   HalfedgeHandle halfedge_handle(FaceHandle _fh) const
   { return face(_fh).halfedge_handle_; }