Stop using std::random_shuffle in favor of std::shuffle.
std::random_shuffle will be removed in C++17. Bug: None Change-Id: Ia2f80d55b1091848787f947b521b9d76cdd5e536 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/38380 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21542}
This commit is contained in:

committed by
Commit Bot

parent
0e1817b202
commit
14de824cbb
@ -10,6 +10,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <limits>
|
||||
#include <random>
|
||||
#include <vector>
|
||||
|
||||
#include "modules/remote_bitrate_estimator/include/send_time_history.h"
|
||||
@ -123,7 +124,8 @@ TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) {
|
||||
for (size_t i = 0; i < num_items; ++i)
|
||||
history_.OnSentPacket(sent_packets[i].sequence_number,
|
||||
sent_packets[i].send_time_ms);
|
||||
std::random_shuffle(received_packets.begin(), received_packets.end());
|
||||
std::shuffle(received_packets.begin(), received_packets.end(),
|
||||
std::mt19937(std::random_device()()));
|
||||
for (size_t i = 0; i < num_items; ++i) {
|
||||
PacketFeedback packet = received_packets[i];
|
||||
EXPECT_TRUE(history_.GetFeedback(&packet, false));
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include "modules/remote_bitrate_estimator/test/bwe.h"
|
||||
|
||||
#include <random>
|
||||
#include <vector>
|
||||
|
||||
#include "rtc_base/arraysize.h"
|
||||
@ -52,7 +53,8 @@ TEST_F(LinkedSetTest, MultiplePackets) {
|
||||
for (size_t i = 0; i < kNumberPackets; ++i) {
|
||||
sequence_numbers.push_back(static_cast<uint16_t>(i + 1));
|
||||
}
|
||||
random_shuffle(sequence_numbers.begin(), sequence_numbers.end());
|
||||
std::shuffle(sequence_numbers.begin(), sequence_numbers.end(),
|
||||
std::mt19937(std::random_device()()));
|
||||
|
||||
for (size_t i = 0; i < kNumberPackets; ++i) {
|
||||
// Other parameters don't matter here.
|
||||
@ -319,7 +321,8 @@ TEST_F(BweReceiverTest, PacketLossUnorderedPackets) {
|
||||
sequence_numbers.push_back(static_cast<uint16_t>(i + 1));
|
||||
}
|
||||
|
||||
random_shuffle(sequence_numbers.begin(), sequence_numbers.end());
|
||||
std::shuffle(sequence_numbers.begin(), sequence_numbers.end(),
|
||||
std::mt19937(std::random_device()()));
|
||||
|
||||
for (size_t i = 0; i < num_packets; ++i) {
|
||||
const MediaPacket media_packet(kFlowId, 0, 0, sequence_numbers[i]);
|
||||
|
@ -12,6 +12,7 @@
|
||||
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
#include <random>
|
||||
#include <vector>
|
||||
|
||||
#include "test/gtest.h"
|
||||
@ -74,7 +75,8 @@ TEST_F(MetricRecorderTest, VariableDelayPackets) {
|
||||
delays_ms.push_back(static_cast<int64_t>(i + 1));
|
||||
}
|
||||
// Order of packets should not matter here.
|
||||
std::random_shuffle(delays_ms.begin(), delays_ms.end());
|
||||
std::shuffle(delays_ms.begin(), delays_ms.end(),
|
||||
std::mt19937(std::random_device()()));
|
||||
|
||||
int first_received_ms = delays_ms[0];
|
||||
int64_t last_received_ms = 0;
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <climits>
|
||||
#include <random>
|
||||
|
||||
#include "rtc_base/constructormagic.h"
|
||||
#include "rtc_base/numerics/percentile_filter.h"
|
||||
@ -113,7 +114,8 @@ TEST_P(PercentileFilterTest, InsertAndEraseTenValuesInRandomOrder) {
|
||||
|
||||
// Insert two sets of |zero_to_nine| in random order.
|
||||
for (int i = 0; i < 2; ++i) {
|
||||
std::random_shuffle(zero_to_nine, zero_to_nine + 10);
|
||||
std::shuffle(zero_to_nine, zero_to_nine + 10,
|
||||
std::mt19937(std::random_device()()));
|
||||
for (int64_t value : zero_to_nine)
|
||||
filter_.Insert(value);
|
||||
// After inserting a full set of |zero_to_nine|, the percentile should
|
||||
@ -123,12 +125,13 @@ TEST_P(PercentileFilterTest, InsertAndEraseTenValuesInRandomOrder) {
|
||||
|
||||
// Insert and erase sets of |zero_to_nine| in random order a few times.
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
std::random_shuffle(zero_to_nine, zero_to_nine + 10);
|
||||
std::shuffle(zero_to_nine, zero_to_nine + 10,
|
||||
std::mt19937(std::random_device()()));
|
||||
for (int64_t value : zero_to_nine)
|
||||
filter_.Erase(value);
|
||||
EXPECT_EQ(expected_value, filter_.GetPercentileValue());
|
||||
|
||||
std::random_shuffle(zero_to_nine, zero_to_nine + 10);
|
||||
std::shuffle(zero_to_nine, zero_to_nine + 10,
|
||||
std::mt19937(std::random_device()()));
|
||||
for (int64_t value : zero_to_nine)
|
||||
filter_.Insert(value);
|
||||
EXPECT_EQ(expected_value, filter_.GetPercentileValue());
|
||||
|
Reference in New Issue
Block a user