diff options
author | Kostya Serebryany <kcc@google.com> | 2017-02-07 23:13:10 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2017-02-07 23:13:10 +0000 |
commit | 263722f40f46c98c2a24c6b1f102c3875803502b (patch) | |
tree | 420b7dc6eb83332ad07266b8a61d1d4274624cf7 /compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc | |
parent | 1d43552a4027393f2a58812cf76b274f37f13375 (diff) | |
download | bcm5719-llvm-263722f40f46c98c2a24c6b1f102c3875803502b.tar.gz bcm5719-llvm-263722f40f46c98c2a24c6b1f102c3875803502b.zip |
[asan] replace std::random_shuffle with std::shuffle in tests since std::random_shuffle is being deprecated in C++17; NFC
llvm-svn: 294370
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc')
-rw-r--r-- | compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc index 8df5efda674..e14517fca51 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc @@ -23,6 +23,7 @@ #include <stdlib.h> #include <algorithm> #include <vector> +#include <random> #include <set> using namespace __sanitizer; @@ -539,6 +540,7 @@ void TestCombinedAllocator() { Allocator; Allocator *a = new Allocator; a->Init(/* may_return_null */ true, kReleaseToOSIntervalNever); + std::mt19937 r; AllocatorCache cache; memset(&cache, 0, sizeof(cache)); @@ -570,7 +572,7 @@ void TestCombinedAllocator() { allocated.push_back(x); } - random_shuffle(allocated.begin(), allocated.end()); + std::shuffle(allocated.begin(), allocated.end(), r); for (uptr i = 0; i < kNumAllocs; i++) { void *x = allocated[i]; |