[Bf-blender-cvs] [0f78a579047] master: Make BLI_edgehash_test compatible with C++17

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


Commit: 0f78a579047ec8946021ca58b8ee48f7486e6605
Author: Sergey Sharybin
Date:   Thu Jun 18 11:19:27 2020 +0200
Branches: master
https://developer.blender.org/rB0f78a579047ec8946021ca58b8ee48f7486e6605

Make BLI_edgehash_test compatible with C++17

random_shuffle was removed (at least the used version).

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

M	tests/gtests/blenlib/BLI_edgehash_test.cc

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

diff --git a/tests/gtests/blenlib/BLI_edgehash_test.cc b/tests/gtests/blenlib/BLI_edgehash_test.cc
index 982f5b35565..23ad618825b 100644
--- a/tests/gtests/blenlib/BLI_edgehash_test.cc
+++ b/tests/gtests/blenlib/BLI_edgehash_test.cc
@@ -2,6 +2,7 @@
 
 #include "testing/testing.h"
 #include <algorithm>
+#include <random>
 #include <vector>
 
 extern "C" {
@@ -320,7 +321,7 @@ TEST(edgehash, StressTest)
   }
 
   std::vector<Edge> shuffled = edges;
-  std::random_shuffle(shuffled.begin(), shuffled.end());
+  std::shuffle(shuffled.begin(), shuffled.end(), std::default_random_engine());
 
   /* then remove half of them */
   int remove_until = shuffled.size() / 2;



More information about the Bf-blender-cvs mailing list