[Bf-blender-cvs] [3ea03318bb8] functions: fix compile error and warning on macos

Jacques Lucke noreply at git.blender.org
Mon Aug 5 13:07:53 CEST 2019


Commit: 3ea03318bb833bc0713e29392cc67e2c486fd9d7
Author: Jacques Lucke
Date:   Mon Aug 5 13:07:40 2019 +0200
Branches: functions
https://developer.blender.org/rB3ea03318bb833bc0713e29392cc67e2c486fd9d7

fix compile error and warning on macos

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

M	source/blender/blenlib/BLI_multimap.hpp
M	source/blender/blenlib/BLI_range.hpp

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

diff --git a/source/blender/blenlib/BLI_multimap.hpp b/source/blender/blenlib/BLI_multimap.hpp
index e9d74ff540d..ddd8904361e 100644
--- a/source/blender/blenlib/BLI_multimap.hpp
+++ b/source/blender/blenlib/BLI_multimap.hpp
@@ -43,6 +43,7 @@ template<typename K, typename V, uint N = 4> class MultiMap {
         key,
         /* Insert new key with value. */
         [this, &key, &value]() -> Entry {
+          UNUSED_VARS(key);
           uint offset = m_elements.size();
           m_elements.append(value);
           return {offset, 1, 1};
diff --git a/source/blender/blenlib/BLI_range.hpp b/source/blender/blenlib/BLI_range.hpp
index e3eb736e397..4a7de175f4c 100644
--- a/source/blender/blenlib/BLI_range.hpp
+++ b/source/blender/blenlib/BLI_range.hpp
@@ -4,6 +4,8 @@
  * actually allocating an array.
  */
 
+#include <cmath>
+
 #include "BLI_utildefines.h"
 #include "BLI_vector.hpp"



More information about the Bf-blender-cvs mailing list