commit ec2eb2218f1e19ef8a675d494f565b2a9975a7d3
author Sebastian Jansson <srte@webrtc.org> Thu May 24 12:32:05 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Thu May 24 12:45:21 2018 +0000
tree d59d23192ca902129d70e1b7d48d61dcb6cc5104
parent a927ed576a486f9f2f2875a85c70a898ed8bbc6b

Enables comparison with infinite timestamps.

Bug: webrtc:8415
Change-Id: Ia96c7a537d994c281d8b24e648dbb2e17de3ed4a
Reviewed-on: https://webrtc-review.googlesource.com/78182
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23383}

api/units/timestamp.h

diff --git a/api/units/timestamp.h b/api/units/timestamp.h
index af62b3b..40f3e92 100644
--- a/api/units/timestamp.h
+++ b/api/units/timestamp.h
@@ -78,10 +78,18 @@
   bool operator!=(const Timestamp& other) const {
     return microseconds_ != other.microseconds_;
   }
-  bool operator<=(const Timestamp& other) const { return us() <= other.us(); }
-  bool operator>=(const Timestamp& other) const { return us() >= other.us(); }
-  bool operator>(const Timestamp& other) const { return us() > other.us(); }
-  bool operator<(const Timestamp& other) const { return us() < other.us(); }
+  bool operator<=(const Timestamp& other) const {
+    return microseconds_ <= other.microseconds_;
+  }
+  bool operator>=(const Timestamp& other) const {
+    return microseconds_ >= other.microseconds_;
+  }
+  bool operator>(const Timestamp& other) const {
+    return microseconds_ > other.microseconds_;
+  }
+  bool operator<(const Timestamp& other) const {
+    return microseconds_ < other.microseconds_;
+  }
 
  private:
   explicit Timestamp(int64_t us) : microseconds_(us) {}

api/units/timestamp_unittest.cc

diff --git a/api/units/timestamp_unittest.cc b/api/units/timestamp_unittest.cc
index 549a9c8..3b2770c 100644
--- a/api/units/timestamp_unittest.cc
+++ b/api/units/timestamp_unittest.cc
@@ -46,6 +46,8 @@
   const int64_t kLarge = 451;
 
   EXPECT_EQ(Timestamp::Infinity(), Timestamp::Infinity());
+  EXPECT_GE(Timestamp::Infinity(), Timestamp::Infinity());
+  EXPECT_GT(Timestamp::Infinity(), Timestamp::ms(kLarge));
   EXPECT_EQ(Timestamp::ms(kSmall), Timestamp::ms(kSmall));
   EXPECT_LE(Timestamp::ms(kSmall), Timestamp::ms(kSmall));
   EXPECT_GE(Timestamp::ms(kSmall), Timestamp::ms(kSmall));