[Bf-blender-cvs] [7ae9227794c] master: Quadriflow: Fix compilation error with C++17

Sergey Sharybin noreply at git.blender.org
Fri Jun 19 12:03:02 CEST 2020


Commit: 7ae9227794cb68be7af5cc3b10997fca93a2a76a
Author: Sergey Sharybin
Date:   Thu Jun 18 15:16:47 2020 +0200
Branches: master
https://developer.blender.org/rB7ae9227794cb68be7af5cc3b10997fca93a2a76a

Quadriflow: Fix compilation error with C++17

Unary function has been removed.
Unless I'm missing something subclass is not needed here.

===================================================================

M	intern/quadriflow/quadriflow_capi.cpp

===================================================================

diff --git a/intern/quadriflow/quadriflow_capi.cpp b/intern/quadriflow/quadriflow_capi.cpp
index 302c7a0ae30..53237289874 100644
--- a/intern/quadriflow/quadriflow_capi.cpp
+++ b/intern/quadriflow/quadriflow_capi.cpp
@@ -49,7 +49,7 @@ struct ObjVertex {
   }
 };
 
-struct ObjVertexHash : std::unary_function<ObjVertex, size_t> {
+struct ObjVertexHash {
   std::size_t operator()(const ObjVertex &v) const
   {
     size_t hash = std::hash<uint32_t>()(v.p);



More information about the Bf-blender-cvs mailing list