From 01b7e929e25dd9d652b49359094c989f3ea429a7 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 10 Sep 2019 13:28:58 +0200 Subject: [PATCH] Mark test::DriftingClock constants as constexpr Bug: None Change-Id: Ie9e2772c00a57c6020e8d60b0f125b6c442f205b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152380 Reviewed-by: Niels Moller Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#29132} --- test/drifting_clock.cc | 4 +--- test/drifting_clock.h | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/drifting_clock.cc b/test/drifting_clock.cc index 0e3d2a6c6e..1a5154557e 100644 --- a/test/drifting_clock.cc +++ b/test/drifting_clock.cc @@ -14,9 +14,7 @@ namespace webrtc { namespace test { -const float DriftingClock::kDoubleSpeed = 2.0f; -const float DriftingClock::kNoDrift = 1.0f; -const float DriftingClock::kHalfSpeed = 0.5f; +constexpr float DriftingClock::kNoDrift; DriftingClock::DriftingClock(Clock* clock, float speed) : clock_(clock), drift_(speed - 1.0f), start_time_(clock_->CurrentTime()) { diff --git a/test/drifting_clock.h b/test/drifting_clock.h index 9ed3923588..2539b61786 100644 --- a/test/drifting_clock.h +++ b/test/drifting_clock.h @@ -19,16 +19,16 @@ namespace webrtc { namespace test { class DriftingClock : public Clock { public: - // TODO(danilchap): Make this constants constexpr when it would be supported. - static const float kDoubleSpeed; // 2.0f; - static const float kNoDrift; // 1.0f; - static const float kHalfSpeed; // 0.5f; + static constexpr float kNoDrift = 1.0f; DriftingClock(Clock* clock, float speed); - // TODO(danilchap): Make this functions constexpr when it would be supported. - static float PercentsFaster(float percent) { return 1.0f + percent / 100.0f; } - static float PercentsSlower(float percent) { return 1.0f - percent / 100.0f; } + static constexpr float PercentsFaster(float percent) { + return 1.0f + percent / 100.0f; + } + static constexpr float PercentsSlower(float percent) { + return 1.0f - percent / 100.0f; + } Timestamp CurrentTime() override; NtpTime CurrentNtpTime() override;