[Bf-blender-cvs] [84d4447bc52] master: BLI: fix type forwarding in Map

Jacques Lucke noreply at git.blender.org
Wed Jun 10 18:27:34 CEST 2020


Commit: 84d4447bc5220246f9d16ae3e91419af47b37b58
Author: Jacques Lucke
Date:   Wed Jun 10 18:27:11 2020 +0200
Branches: master
https://developer.blender.org/rB84d4447bc5220246f9d16ae3e91419af47b37b58

BLI: fix type forwarding in Map

Without this change, the code might do an unwanted conversion.

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

M	source/blender/blenlib/BLI_map.hh

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

diff --git a/source/blender/blenlib/BLI_map.hh b/source/blender/blenlib/BLI_map.hh
index 82415dd5726..13f1a967d65 100644
--- a/source/blender/blenlib/BLI_map.hh
+++ b/source/blender/blenlib/BLI_map.hh
@@ -610,7 +610,7 @@ class Map {
    */
   template<typename ForwardKey> Value &lookup_or_add_default_as(ForwardKey &&key)
   {
-    return this->lookup_or_add_cb(std::forward<ForwardKey>(key), []() { return Value(); });
+    return this->lookup_or_add_cb_as(std::forward<ForwardKey>(key), []() { return Value(); });
   }
 
   /**



More information about the Bf-blender-cvs mailing list