Rename safe_cmp::{Eq,Ne,Lt,Le,Ge,Gt} to Safe{Eq,Ne,Lt,Le,Ge,Gt}

webrtc/base/safe_compare_unittest.cc

Index: webrtc/base/safe_compare_unittest.cc
diff --git a/webrtc/base/safe_compare_unittest.cc b/webrtc/base/safe_compare_unittest.cc
index 9663164e30d5f57ec4e4408d42004b569ca98651..1ebb7222e2df04d92ad3b39735e22859cf4af05b 100644
--- a/webrtc/base/safe_compare_unittest.cc
+++ b/webrtc/base/safe_compare_unittest.cc
@@ -40,10 +40,10 @@ static const std::pair<int, int> p2(1, 2);
 // arithmetic and logic instructions (but no extra control flow instructions).
 bool TestLessThanRef(      int a,      int b) { return a < b; }
 bool TestLessThanRef( unsigned a, unsigned b) { return a < b; }
-bool TestLessThanSafe(     int a,      int b) { return safe_cmp::Lt(a, b); }
-bool TestLessThanSafe(unsigned a, unsigned b) { return safe_cmp::Lt(a, b); }
-bool TestLessThanSafe(unsigned a,      int b) { return safe_cmp::Lt(a, b); }
-bool TestLessThanSafe(     int a, unsigned b) { return safe_cmp::Lt(a, b); }
+bool TestLessThanSafe(     int a,      int b) { return SafeLt(a, b); }
+bool TestLessThanSafe(unsigned a, unsigned b) { return SafeLt(a, b); }
+bool TestLessThanSafe(unsigned a,      int b) { return SafeLt(a, b); }
+bool TestLessThanSafe(     int a, unsigned b) { return SafeLt(a, b); }
 
 // For these, we expect the *Ref and *Safe functions to result in identical
 // code, except for the ones that compare a signed variable with an unsigned
@@ -54,326 +54,326 @@ bool TestLessThan17Ref(       int a) { return a < 17; }
 bool TestLessThan17Ref(  unsigned a) { return a < 17; }
 bool TestLessThan17uRef(      int a) { return static_cast<unsigned>(a) < 17u; }
 bool TestLessThan17uRef( unsigned a) { return a < 17u; }
-bool TestLessThan17Safe(      int a) { return safe_cmp::Lt(a, 17); }
-bool TestLessThan17Safe( unsigned a) { return safe_cmp::Lt(a, 17); }
-bool TestLessThan17uSafe(     int a) { return safe_cmp::Lt(a, 17u); }
-bool TestLessThan17uSafe(unsigned a) { return safe_cmp::Lt(a, 17u); }
+bool TestLessThan17Safe(      int a) { return SafeLt(a, 17); }
+bool TestLessThan17Safe( unsigned a) { return SafeLt(a, 17); }
+bool TestLessThan17uSafe(     int a) { return SafeLt(a, 17u); }
+bool TestLessThan17uSafe(unsigned a) { return SafeLt(a, 17u); }
 
 // Cases where we can't convert to a larger signed type.
-bool TestLessThanMax( intmax_t a, uintmax_t b) { return safe_cmp::Lt(a, b); }
-bool TestLessThanMax(uintmax_t a,  intmax_t b) { return safe_cmp::Lt(a, b); }
-bool TestLessThanMax17u( intmax_t a) { return safe_cmp::Lt(a, uintmax_t{17}); }
-bool TestLessThanMax17( uintmax_t a) { return safe_cmp::Lt(a,  intmax_t{17}); }
+bool TestLessThanMax( intmax_t a, uintmax_t b) { return SafeLt(a, b); }
+bool TestLessThanMax(uintmax_t a,  intmax_t b) { return SafeLt(a, b); }
+bool TestLessThanMax17u( intmax_t a) { return SafeLt(a, uintmax_t{17}); }
+bool TestLessThanMax17( uintmax_t a) { return SafeLt(a,  intmax_t{17}); }
 
 // Cases where the compiler should be able to compute the result at compile
 // time.
-bool TestLessThanConst1() { return safe_cmp::Lt(  -1,    1); }
-bool TestLessThanConst2() { return safe_cmp::Lt(  m1, umax); }
-bool TestLessThanConst3() { return safe_cmp::Lt(umax, imin); }
-bool TestLessThanConst4(unsigned a) { return safe_cmp::Lt( a, -1); }
-bool TestLessThanConst5(unsigned a) { return safe_cmp::Lt(-1,  a); }
-bool TestLessThanConst6(unsigned a) { return safe_cmp::Lt( a,  a); }
+bool TestLessThanConst1() { return SafeLt(  -1,    1); }
+bool TestLessThanConst2() { return SafeLt(  m1, umax); }
+bool TestLessThanConst3() { return SafeLt(umax, imin); }
+bool TestLessThanConst4(unsigned a) { return SafeLt( a, -1); }
+bool TestLessThanConst5(unsigned a) { return SafeLt(-1,  a); }
+bool TestLessThanConst6(unsigned a) { return SafeLt( a,  a); }
 
 // clang-format on
 
 TEST(SafeCmpTest, Eq) {
-  static_assert(!safe_cmp::Eq(-1, 2), "");
-  static_assert(!safe_cmp::Eq(-1, 2u), "");
-  static_assert(!safe_cmp::Eq(2, -1), "");
-  static_assert(!safe_cmp::Eq(2u, -1), "");
-
-  static_assert(!safe_cmp::Eq(1, 2), "");
-  static_assert(!safe_cmp::Eq(1, 2u), "");
-  static_assert(!safe_cmp::Eq(1u, 2), "");
-  static_assert(!safe_cmp::Eq(1u, 2u), "");
-  static_assert(!safe_cmp::Eq(2, 1), "");
-  static_assert(!safe_cmp::Eq(2, 1u), "");
-  static_assert(!safe_cmp::Eq(2u, 1), "");
-  static_assert(!safe_cmp::Eq(2u, 1u), "");
-
-  static_assert(safe_cmp::Eq(2, 2), "");
-  static_assert(safe_cmp::Eq(2, 2u), "");
-  static_assert(safe_cmp::Eq(2u, 2), "");
-  static_assert(safe_cmp::Eq(2u, 2u), "");
-
-  static_assert(safe_cmp::Eq(imin, imin), "");
-  static_assert(!safe_cmp::Eq(imin, umax), "");
-  static_assert(!safe_cmp::Eq(umax, imin), "");
-  static_assert(safe_cmp::Eq(umax, umax), "");
-
-  static_assert(safe_cmp::Eq(m1, m1), "");
-  static_assert(!safe_cmp::Eq(m1, umax), "");
-  static_assert(!safe_cmp::Eq(umax, m1), "");
-  static_assert(safe_cmp::Eq(umax, umax), "");
-
-  static_assert(!safe_cmp::Eq(1, 2), "");
-  static_assert(!safe_cmp::Eq(1, 2.0), "");
-  static_assert(!safe_cmp::Eq(1.0, 2), "");
-  static_assert(!safe_cmp::Eq(1.0, 2.0), "");
-  static_assert(!safe_cmp::Eq(2, 1), "");
-  static_assert(!safe_cmp::Eq(2, 1.0), "");
-  static_assert(!safe_cmp::Eq(2.0, 1), "");
-  static_assert(!safe_cmp::Eq(2.0, 1.0), "");
-
-  static_assert(safe_cmp::Eq(2, 2), "");
-  static_assert(safe_cmp::Eq(2, 2.0), "");
-  static_assert(safe_cmp::Eq(2.0, 2), "");
-  static_assert(safe_cmp::Eq(2.0, 2.0), "");
-
-  EXPECT_TRUE(safe_cmp::Eq(p1, p1));
-  EXPECT_FALSE(safe_cmp::Eq(p1, p2));
-  EXPECT_FALSE(safe_cmp::Eq(p2, p1));
-  EXPECT_TRUE(safe_cmp::Eq(p2, p2));
+  static_assert(!SafeEq(-1, 2), "");
+  static_assert(!SafeEq(-1, 2u), "");
+  static_assert(!SafeEq(2, -1), "");
+  static_assert(!SafeEq(2u, -1), "");
+
+  static_assert(!SafeEq(1, 2), "");
+  static_assert(!SafeEq(1, 2u), "");
+  static_assert(!SafeEq(1u, 2), "");
+  static_assert(!SafeEq(1u, 2u), "");
+  static_assert(!SafeEq(2, 1), "");
+  static_assert(!SafeEq(2, 1u), "");
+  static_assert(!SafeEq(2u, 1), "");
+  static_assert(!SafeEq(2u, 1u), "");
+
+  static_assert(SafeEq(2, 2), "");
+  static_assert(SafeEq(2, 2u), "");
+  static_assert(SafeEq(2u, 2), "");
+  static_assert(SafeEq(2u, 2u), "");
+
+  static_assert(SafeEq(imin, imin), "");
+  static_assert(!SafeEq(imin, umax), "");
+  static_assert(!SafeEq(umax, imin), "");
+  static_assert(SafeEq(umax, umax), "");
+
+  static_assert(SafeEq(m1, m1), "");
+  static_assert(!SafeEq(m1, umax), "");
+  static_assert(!SafeEq(umax, m1), "");
+  static_assert(SafeEq(umax, umax), "");
+
+  static_assert(!SafeEq(1, 2), "");
+  static_assert(!SafeEq(1, 2.0), "");
+  static_assert(!SafeEq(1.0, 2), "");
+  static_assert(!SafeEq(1.0, 2.0), "");
+  static_assert(!SafeEq(2, 1), "");
+  static_assert(!SafeEq(2, 1.0), "");
+  static_assert(!SafeEq(2.0, 1), "");
+  static_assert(!SafeEq(2.0, 1.0), "");
+
+  static_assert(SafeEq(2, 2), "");
+  static_assert(SafeEq(2, 2.0), "");
+  static_assert(SafeEq(2.0, 2), "");
+  static_assert(SafeEq(2.0, 2.0), "");
+
+  EXPECT_TRUE(SafeEq(p1, p1));
+  EXPECT_FALSE(SafeEq(p1, p2));
+  EXPECT_FALSE(SafeEq(p2, p1));
+  EXPECT_TRUE(SafeEq(p2, p2));
 }
 
 TEST(SafeCmpTest, Ne) {
-  static_assert(safe_cmp::Ne(-1, 2), "");
-  static_assert(safe_cmp::Ne(-1, 2u), "");
-  static_assert(safe_cmp::Ne(2, -1), "");
-  static_assert(safe_cmp::Ne(2u, -1), "");
-
-  static_assert(safe_cmp::Ne(1, 2), "");
-  static_assert(safe_cmp::Ne(1, 2u), "");
-  static_assert(safe_cmp::Ne(1u, 2), "");
-  static_assert(safe_cmp::Ne(1u, 2u), "");
-  static_assert(safe_cmp::Ne(2, 1), "");
-  static_assert(safe_cmp::Ne(2, 1u), "");
-  static_assert(safe_cmp::Ne(2u, 1), "");
-  static_assert(safe_cmp::Ne(2u, 1u), "");
-
-  static_assert(!safe_cmp::Ne(2, 2), "");
-  static_assert(!safe_cmp::Ne(2, 2u), "");
-  static_assert(!safe_cmp::Ne(2u, 2), "");
-  static_assert(!safe_cmp::Ne(2u, 2u), "");
-
-  static_assert(!safe_cmp::Ne(imin, imin), "");
-  static_assert(safe_cmp::Ne(imin, umax), "");
-  static_assert(safe_cmp::Ne(umax, imin), "");
-  static_assert(!safe_cmp::Ne(umax, umax), "");
-
-  static_assert(!safe_cmp::Ne(m1, m1), "");
-  static_assert(safe_cmp::Ne(m1, umax), "");
-  static_assert(safe_cmp::Ne(umax, m1), "");
-  static_assert(!safe_cmp::Ne(umax, umax), "");
-
-  static_assert(safe_cmp::Ne(1, 2), "");
-  static_assert(safe_cmp::Ne(1, 2.0), "");
-  static_assert(safe_cmp::Ne(1.0, 2), "");
-  static_assert(safe_cmp::Ne(1.0, 2.0), "");
-  static_assert(safe_cmp::Ne(2, 1), "");
-  static_assert(safe_cmp::Ne(2, 1.0), "");
-  static_assert(safe_cmp::Ne(2.0, 1), "");
-  static_assert(safe_cmp::Ne(2.0, 1.0), "");
-
-  static_assert(!safe_cmp::Ne(2, 2), "");
-  static_assert(!safe_cmp::Ne(2, 2.0), "");
-  static_assert(!safe_cmp::Ne(2.0, 2), "");
-  static_assert(!safe_cmp::Ne(2.0, 2.0), "");
-
-  EXPECT_FALSE(safe_cmp::Ne(p1, p1));
-  EXPECT_TRUE(safe_cmp::Ne(p1, p2));
-  EXPECT_TRUE(safe_cmp::Ne(p2, p1));
-  EXPECT_FALSE(safe_cmp::Ne(p2, p2));
+  static_assert(SafeNe(-1, 2), "");
+  static_assert(SafeNe(-1, 2u), "");
+  static_assert(SafeNe(2, -1), "");
+  static_assert(SafeNe(2u, -1), "");
+
+  static_assert(SafeNe(1, 2), "");
+  static_assert(SafeNe(1, 2u), "");
+  static_assert(SafeNe(1u, 2), "");
+  static_assert(SafeNe(1u, 2u), "");
+  static_assert(SafeNe(2, 1), "");
+  static_assert(SafeNe(2, 1u), "");
+  static_assert(SafeNe(2u, 1), "");
+  static_assert(SafeNe(2u, 1u), "");
+
+  static_assert(!SafeNe(2, 2), "");
+  static_assert(!SafeNe(2, 2u), "");
+  static_assert(!SafeNe(2u, 2), "");
+  static_assert(!SafeNe(2u, 2u), "");
+
+  static_assert(!SafeNe(imin, imin), "");
+  static_assert(SafeNe(imin, umax), "");
+  static_assert(SafeNe(umax, imin), "");
+  static_assert(!SafeNe(umax, umax), "");
+
+  static_assert(!SafeNe(m1, m1), "");
+  static_assert(SafeNe(m1, umax), "");
+  static_assert(SafeNe(umax, m1), "");
+  static_assert(!SafeNe(umax, umax), "");
+
+  static_assert(SafeNe(1, 2), "");
+  static_assert(SafeNe(1, 2.0), "");
+  static_assert(SafeNe(1.0, 2), "");
+  static_assert(SafeNe(1.0, 2.0), "");
+  static_assert(SafeNe(2, 1), "");
+  static_assert(SafeNe(2, 1.0), "");
+  static_assert(SafeNe(2.0, 1), "");
+  static_assert(SafeNe(2.0, 1.0), "");
+
+  static_assert(!SafeNe(2, 2), "");
+  static_assert(!SafeNe(2, 2.0), "");
+  static_assert(!SafeNe(2.0, 2), "");
+  static_assert(!SafeNe(2.0, 2.0), "");
+
+  EXPECT_FALSE(SafeNe(p1, p1));
+  EXPECT_TRUE(SafeNe(p1, p2));
+  EXPECT_TRUE(SafeNe(p2, p1));
+  EXPECT_FALSE(SafeNe(p2, p2));
 }
 
 TEST(SafeCmpTest, Lt) {
-  static_assert(safe_cmp::Lt(-1, 2), "");
-  static_assert(safe_cmp::Lt(-1, 2u), "");
-  static_assert(!safe_cmp::Lt(2, -1), "");
-  static_assert(!safe_cmp::Lt(2u, -1), "");
-
-  static_assert(safe_cmp::Lt(1, 2), "");
-  static_assert(safe_cmp::Lt(1, 2u), "");
-  static_assert(safe_cmp::Lt(1u, 2), "");
-  static_assert(safe_cmp::Lt(1u, 2u), "");
-  static_assert(!safe_cmp::Lt(2, 1), "");
-  static_assert(!safe_cmp::Lt(2, 1u), "");
-  static_assert(!safe_cmp::Lt(2u, 1), "");
-  static_assert(!safe_cmp::Lt(2u, 1u), "");
-
-  static_assert(!safe_cmp::Lt(2, 2), "");
-  static_assert(!safe_cmp::Lt(2, 2u), "");
-  static_assert(!safe_cmp::Lt(2u, 2), "");
-  static_assert(!safe_cmp::Lt(2u, 2u), "");
-
-  static_assert(!safe_cmp::Lt(imin, imin), "");
-  static_assert(safe_cmp::Lt(imin, umax), "");
-  static_assert(!safe_cmp::Lt(umax, imin), "");
-  static_assert(!safe_cmp::Lt(umax, umax), "");
-
-  static_assert(!safe_cmp::Lt(m1, m1), "");
-  static_assert(safe_cmp::Lt(m1, umax), "");
-  static_assert(!safe_cmp::Lt(umax, m1), "");
-  static_assert(!safe_cmp::Lt(umax, umax), "");
-
-  static_assert(safe_cmp::Lt(1, 2), "");
-  static_assert(safe_cmp::Lt(1, 2.0), "");
-  static_assert(safe_cmp::Lt(1.0, 2), "");
-  static_assert(safe_cmp::Lt(1.0, 2.0), "");
-  static_assert(!safe_cmp::Lt(2, 1), "");
-  static_assert(!safe_cmp::Lt(2, 1.0), "");
-  static_assert(!safe_cmp::Lt(2.0, 1), "");
-  static_assert(!safe_cmp::Lt(2.0, 1.0), "");
-
-  static_assert(!safe_cmp::Lt(2, 2), "");
-  static_assert(!safe_cmp::Lt(2, 2.0), "");
-  static_assert(!safe_cmp::Lt(2.0, 2), "");
-  static_assert(!safe_cmp::Lt(2.0, 2.0), "");
-
-  EXPECT_FALSE(safe_cmp::Lt(p1, p1));
-  EXPECT_TRUE(safe_cmp::Lt(p1, p2));
-  EXPECT_FALSE(safe_cmp::Lt(p2, p1));
-  EXPECT_FALSE(safe_cmp::Lt(p2, p2));
+  static_assert(SafeLt(-1, 2), "");
+  static_assert(SafeLt(-1, 2u), "");
+  static_assert(!SafeLt(2, -1), "");
+  static_assert(!SafeLt(2u, -1), "");
+
+  static_assert(SafeLt(1, 2), "");
+  static_assert(SafeLt(1, 2u), "");
+  static_assert(SafeLt(1u, 2), "");
+  static_assert(SafeLt(1u, 2u), "");
+  static_assert(!SafeLt(2, 1), "");
+  static_assert(!SafeLt(2, 1u), "");
+  static_assert(!SafeLt(2u, 1), "");
+  static_assert(!SafeLt(2u, 1u), "");
+
+  static_assert(!SafeLt(2, 2), "");
+  static_assert(!SafeLt(2, 2u), "");
+  static_assert(!SafeLt(2u, 2), "");
+  static_assert(!SafeLt(2u, 2u), "");
+
+  static_assert(!SafeLt(imin, imin), "");
+  static_assert(SafeLt(imin, umax), "");
+  static_assert(!SafeLt(umax, imin), "");
+  static_assert(!SafeLt(umax, umax), "");
+
+  static_assert(!SafeLt(m1, m1), "");
+  static_assert(SafeLt(m1, umax), "");
+  static_assert(!SafeLt(umax, m1), "");
+  static_assert(!SafeLt(umax, umax), "");
+
+  static_assert(SafeLt(1, 2), "");
+  static_assert(SafeLt(1, 2.0), "");
+  static_assert(SafeLt(1.0, 2), "");
+  static_assert(SafeLt(1.0, 2.0), "");
+  static_assert(!SafeLt(2, 1), "");
+  static_assert(!SafeLt(2, 1.0), "");
+  static_assert(!SafeLt(2.0, 1), "");
+  static_assert(!SafeLt(2.0, 1.0), "");
+
+  static_assert(!SafeLt(2, 2), "");
+  static_assert(!SafeLt(2, 2.0), "");
+  static_assert(!SafeLt(2.0, 2), "");
+  static_assert(!SafeLt(2.0, 2.0), "");
+
+  EXPECT_FALSE(SafeLt(p1, p1));
+  EXPECT_TRUE(SafeLt(p1, p2));
+  EXPECT_FALSE(SafeLt(p2, p1));
+  EXPECT_FALSE(SafeLt(p2, p2));
 }
 
 TEST(SafeCmpTest, Le) {
-  static_assert(safe_cmp::Le(-1, 2), "");
-  static_assert(safe_cmp::Le(-1, 2u), "");
-  static_assert(!safe_cmp::Le(2, -1), "");
-  static_assert(!safe_cmp::Le(2u, -1), "");
-
-  static_assert(safe_cmp::Le(1, 2), "");
-  static_assert(safe_cmp::Le(1, 2u), "");
-  static_assert(safe_cmp::Le(1u, 2), "");
-  static_assert(safe_cmp::Le(1u, 2u), "");
-  static_assert(!safe_cmp::Le(2, 1), "");
-  static_assert(!safe_cmp::Le(2, 1u), "");
-  static_assert(!safe_cmp::Le(2u, 1), "");
-  static_assert(!safe_cmp::Le(2u, 1u), "");
-
-  static_assert(safe_cmp::Le(2, 2), "");
-  static_assert(safe_cmp::Le(2, 2u), "");
-  static_assert(safe_cmp::Le(2u, 2), "");
-  static_assert(safe_cmp::Le(2u, 2u), "");
-
-  static_assert(safe_cmp::Le(imin, imin), "");
-  static_assert(safe_cmp::Le(imin, umax), "");
-  static_assert(!safe_cmp::Le(umax, imin), "");
-  static_assert(safe_cmp::Le(umax, umax), "");
-
-  static_assert(safe_cmp::Le(m1, m1), "");
-  static_assert(safe_cmp::Le(m1, umax), "");
-  static_assert(!safe_cmp::Le(umax, m1), "");
-  static_assert(safe_cmp::Le(umax, umax), "");
-
-  static_assert(safe_cmp::Le(1, 2), "");
-  static_assert(safe_cmp::Le(1, 2.0), "");
-  static_assert(safe_cmp::Le(1.0, 2), "");
-  static_assert(safe_cmp::Le(1.0, 2.0), "");
-  static_assert(!safe_cmp::Le(2, 1), "");
-  static_assert(!safe_cmp::Le(2, 1.0), "");
-  static_assert(!safe_cmp::Le(2.0, 1), "");
-  static_assert(!safe_cmp::Le(2.0, 1.0), "");
-
-  static_assert(safe_cmp::Le(2, 2), "");
-  static_assert(safe_cmp::Le(2, 2.0), "");
-  static_assert(safe_cmp::Le(2.0, 2), "");
-  static_assert(safe_cmp::Le(2.0, 2.0), "");
-
-  EXPECT_TRUE(safe_cmp::Le(p1, p1));
-  EXPECT_TRUE(safe_cmp::Le(p1, p2));
-  EXPECT_FALSE(safe_cmp::Le(p2, p1));
-  EXPECT_TRUE(safe_cmp::Le(p2, p2));
+  static_assert(SafeLe(-1, 2), "");
+  static_assert(SafeLe(-1, 2u), "");
+  static_assert(!SafeLe(2, -1), "");
+  static_assert(!SafeLe(2u, -1), "");
+
+  static_assert(SafeLe(1, 2), "");
+  static_assert(SafeLe(1, 2u), "");
+  static_assert(SafeLe(1u, 2), "");
+  static_assert(SafeLe(1u, 2u), "");
+  static_assert(!SafeLe(2, 1), "");
+  static_assert(!SafeLe(2, 1u), "");
+  static_assert(!SafeLe(2u, 1), "");
+  static_assert(!SafeLe(2u, 1u), "");
+
+  static_assert(SafeLe(2, 2), "");
+  static_assert(SafeLe(2, 2u), "");
+  static_assert(SafeLe(2u, 2), "");
+  static_assert(SafeLe(2u, 2u), "");
+
+  static_assert(SafeLe(imin, imin), "");
+  static_assert(SafeLe(imin, umax), "");
+  static_assert(!SafeLe(umax, imin), "");
+  static_assert(SafeLe(umax, umax), "");
+
+  static_assert(SafeLe(m1, m1), "");
+  static_assert(SafeLe(m1, umax), "");
+  static_assert(!SafeLe(umax, m1), "");
+  static_assert(SafeLe(umax, umax), "");
+
+  static_assert(SafeLe(1, 2), "");
+  static_assert(SafeLe(1, 2.0), "");
+  static_assert(SafeLe(1.0, 2), "");
+  static_assert(SafeLe(1.0, 2.0), "");
+  static_assert(!SafeLe(2, 1), "");
+  static_assert(!SafeLe(2, 1.0), "");
+  static_assert(!SafeLe(2.0, 1), "");
+  static_assert(!SafeLe(2.0, 1.0), "");
+
+  static_assert(SafeLe(2, 2), "");
+  static_assert(SafeLe(2, 2.0), "");
+  static_assert(SafeLe(2.0, 2), "");
+  static_assert(SafeLe(2.0, 2.0), "");
+
+  EXPECT_TRUE(SafeLe(p1, p1));
+  EXPECT_TRUE(SafeLe(p1, p2));
+  EXPECT_FALSE(SafeLe(p2, p1));
+  EXPECT_TRUE(SafeLe(p2, p2));
 }
 
 TEST(SafeCmpTest, Gt) {
-  static_assert(!safe_cmp::Gt(-1, 2), "");
-  static_assert(!safe_cmp::Gt(-1, 2u), "");
-  static_assert(safe_cmp::Gt(2, -1), "");
-  static_assert(safe_cmp::Gt(2u, -1), "");
-
-  static_assert(!safe_cmp::Gt(1, 2), "");
-  static_assert(!safe_cmp::Gt(1, 2u), "");
-  static_assert(!safe_cmp::Gt(1u, 2), "");
-  static_assert(!safe_cmp::Gt(1u, 2u), "");
-  static_assert(safe_cmp::Gt(2, 1), "");
-  static_assert(safe_cmp::Gt(2, 1u), "");
-  static_assert(safe_cmp::Gt(2u, 1), "");
-  static_assert(safe_cmp::Gt(2u, 1u), "");
-
-  static_assert(!safe_cmp::Gt(2, 2), "");
-  static_assert(!safe_cmp::Gt(2, 2u), "");
-  static_assert(!safe_cmp::Gt(2u, 2), "");
-  static_assert(!safe_cmp::Gt(2u, 2u), "");
-
-  static_assert(!safe_cmp::Gt(imin, imin), "");
-  static_assert(!safe_cmp::Gt(imin, umax), "");
-  static_assert(safe_cmp::Gt(umax, imin), "");
-  static_assert(!safe_cmp::Gt(umax, umax), "");
-
-  static_assert(!safe_cmp::Gt(m1, m1), "");
-  static_assert(!safe_cmp::Gt(m1, umax), "");
-  static_assert(safe_cmp::Gt(umax, m1), "");
-  static_assert(!safe_cmp::Gt(umax, umax), "");
-
-  static_assert(!safe_cmp::Gt(1, 2), "");
-  static_assert(!safe_cmp::Gt(1, 2.0), "");
-  static_assert(!safe_cmp::Gt(1.0, 2), "");
-  static_assert(!safe_cmp::Gt(1.0, 2.0), "");
-  static_assert(safe_cmp::Gt(2, 1), "");
-  static_assert(safe_cmp::Gt(2, 1.0), "");
-  static_assert(safe_cmp::Gt(2.0, 1), "");
-  static_assert(safe_cmp::Gt(2.0, 1.0), "");
-
-  static_assert(!safe_cmp::Gt(2, 2), "");
-  static_assert(!safe_cmp::Gt(2, 2.0), "");
-  static_assert(!safe_cmp::Gt(2.0, 2), "");
-  static_assert(!safe_cmp::Gt(2.0, 2.0), "");
-
-  EXPECT_FALSE(safe_cmp::Gt(p1, p1));
-  EXPECT_FALSE(safe_cmp::Gt(p1, p2));
-  EXPECT_TRUE(safe_cmp::Gt(p2, p1));
-  EXPECT_FALSE(safe_cmp::Gt(p2, p2));
+  static_assert(!SafeGt(-1, 2), "");
+  static_assert(!SafeGt(-1, 2u), "");
+  static_assert(SafeGt(2, -1), "");
+  static_assert(SafeGt(2u, -1), "");
+
+  static_assert(!SafeGt(1, 2), "");
+  static_assert(!SafeGt(1, 2u), "");
+  static_assert(!SafeGt(1u, 2), "");
+  static_assert(!SafeGt(1u, 2u), "");
+  static_assert(SafeGt(2, 1), "");
+  static_assert(SafeGt(2, 1u), "");
+  static_assert(SafeGt(2u, 1), "");
+  static_assert(SafeGt(2u, 1u), "");
+
+  static_assert(!SafeGt(2, 2), "");
+  static_assert(!SafeGt(2, 2u), "");
+  static_assert(!SafeGt(2u, 2), "");
+  static_assert(!SafeGt(2u, 2u), "");
+
+  static_assert(!SafeGt(imin, imin), "");
+  static_assert(!SafeGt(imin, umax), "");
+  static_assert(SafeGt(umax, imin), "");
+  static_assert(!SafeGt(umax, umax), "");
+
+  static_assert(!SafeGt(m1, m1), "");
+  static_assert(!SafeGt(m1, umax), "");
+  static_assert(SafeGt(umax, m1), "");
+  static_assert(!SafeGt(umax, umax), "");
+
+  static_assert(!SafeGt(1, 2), "");
+  static_assert(!SafeGt(1, 2.0), "");
+  static_assert(!SafeGt(1.0, 2), "");
+  static_assert(!SafeGt(1.0, 2.0), "");
+  static_assert(SafeGt(2, 1), "");
+  static_assert(SafeGt(2, 1.0), "");
+  static_assert(SafeGt(2.0, 1), "");
+  static_assert(SafeGt(2.0, 1.0), "");
+
+  static_assert(!SafeGt(2, 2), "");
+  static_assert(!SafeGt(2, 2.0), "");
+  static_assert(!SafeGt(2.0, 2), "");
+  static_assert(!SafeGt(2.0, 2.0), "");
+
+  EXPECT_FALSE(SafeGt(p1, p1));
+  EXPECT_FALSE(SafeGt(p1, p2));
+  EXPECT_TRUE(SafeGt(p2, p1));
+  EXPECT_FALSE(SafeGt(p2, p2));
 }
 
 TEST(SafeCmpTest, Ge) {
-  static_assert(!safe_cmp::Ge(-1, 2), "");
-  static_assert(!safe_cmp::Ge(-1, 2u), "");
-  static_assert(safe_cmp::Ge(2, -1), "");
-  static_assert(safe_cmp::Ge(2u, -1), "");
-
-  static_assert(!safe_cmp::Ge(1, 2), "");
-  static_assert(!safe_cmp::Ge(1, 2u), "");
-  static_assert(!safe_cmp::Ge(1u, 2), "");
-  static_assert(!safe_cmp::Ge(1u, 2u), "");
-  static_assert(safe_cmp::Ge(2, 1), "");
-  static_assert(safe_cmp::Ge(2, 1u), "");
-  static_assert(safe_cmp::Ge(2u, 1), "");
-  static_assert(safe_cmp::Ge(2u, 1u), "");
-
-  static_assert(safe_cmp::Ge(2, 2), "");
-  static_assert(safe_cmp::Ge(2, 2u), "");
-  static_assert(safe_cmp::Ge(2u, 2), "");
-  static_assert(safe_cmp::Ge(2u, 2u), "");
-
-  static_assert(safe_cmp::Ge(imin, imin), "");
-  static_assert(!safe_cmp::Ge(imin, umax), "");
-  static_assert(safe_cmp::Ge(umax, imin), "");
-  static_assert(safe_cmp::Ge(umax, umax), "");
-
-  static_assert(safe_cmp::Ge(m1, m1), "");
-  static_assert(!safe_cmp::Ge(m1, umax), "");
-  static_assert(safe_cmp::Ge(umax, m1), "");
-  static_assert(safe_cmp::Ge(umax, umax), "");
-
-  static_assert(!safe_cmp::Ge(1, 2), "");
-  static_assert(!safe_cmp::Ge(1, 2.0), "");
-  static_assert(!safe_cmp::Ge(1.0, 2), "");
-  static_assert(!safe_cmp::Ge(1.0, 2.0), "");
-  static_assert(safe_cmp::Ge(2, 1), "");
-  static_assert(safe_cmp::Ge(2, 1.0), "");
-  static_assert(safe_cmp::Ge(2.0, 1), "");
-  static_assert(safe_cmp::Ge(2.0, 1.0), "");
-
-  static_assert(safe_cmp::Ge(2, 2), "");
-  static_assert(safe_cmp::Ge(2, 2.0), "");
-  static_assert(safe_cmp::Ge(2.0, 2), "");
-  static_assert(safe_cmp::Ge(2.0, 2.0), "");
-
-  EXPECT_TRUE(safe_cmp::Ge(p1, p1));
-  EXPECT_FALSE(safe_cmp::Ge(p1, p2));
-  EXPECT_TRUE(safe_cmp::Ge(p2, p1));
-  EXPECT_TRUE(safe_cmp::Ge(p2, p2));
+  static_assert(!SafeGe(-1, 2), "");
+  static_assert(!SafeGe(-1, 2u), "");
+  static_assert(SafeGe(2, -1), "");
+  static_assert(SafeGe(2u, -1), "");
+
+  static_assert(!SafeGe(1, 2), "");
+  static_assert(!SafeGe(1, 2u), "");
+  static_assert(!SafeGe(1u, 2), "");
+  static_assert(!SafeGe(1u, 2u), "");
+  static_assert(SafeGe(2, 1), "");
+  static_assert(SafeGe(2, 1u), "");
+  static_assert(SafeGe(2u, 1), "");
+  static_assert(SafeGe(2u, 1u), "");
+
+  static_assert(SafeGe(2, 2), "");
+  static_assert(SafeGe(2, 2u), "");
+  static_assert(SafeGe(2u, 2), "");
+  static_assert(SafeGe(2u, 2u), "");
+
+  static_assert(SafeGe(imin, imin), "");
+  static_assert(!SafeGe(imin, umax), "");
+  static_assert(SafeGe(umax, imin), "");
+  static_assert(SafeGe(umax, umax), "");
+
+  static_assert(SafeGe(m1, m1), "");
+  static_assert(!SafeGe(m1, umax), "");
+  static_assert(SafeGe(umax, m1), "");
+  static_assert(SafeGe(umax, umax), "");
+
+  static_assert(!SafeGe(1, 2), "");
+  static_assert(!SafeGe(1, 2.0), "");
+  static_assert(!SafeGe(1.0, 2), "");
+  static_assert(!SafeGe(1.0, 2.0), "");
+  static_assert(SafeGe(2, 1), "");
+  static_assert(SafeGe(2, 1.0), "");
+  static_assert(SafeGe(2.0, 1), "");
+  static_assert(SafeGe(2.0, 1.0), "");
+
+  static_assert(SafeGe(2, 2), "");
+  static_assert(SafeGe(2, 2.0), "");
+  static_assert(SafeGe(2.0, 2), "");
+  static_assert(SafeGe(2.0, 2.0), "");
+
+  EXPECT_TRUE(SafeGe(p1, p1));
+  EXPECT_FALSE(SafeGe(p1, p2));
+  EXPECT_TRUE(SafeGe(p2, p1));
+  EXPECT_TRUE(SafeGe(p2, p2));
 }
 
 TEST(SafeCmpTest, Enum) {
@@ -381,14 +381,14 @@ TEST(SafeCmpTest, Enum) {
   enum { e2 = 13 };
   enum E3 : unsigned { e3 = 13 };
   enum : unsigned { e4 = 13 };
-  static_assert(safe_cmp::Eq(13, e1), "");
-  static_assert(safe_cmp::Eq(13u, e1), "");
-  static_assert(safe_cmp::Eq(13, e2), "");
-  static_assert(safe_cmp::Eq(13u, e2), "");
-  static_assert(safe_cmp::Eq(13, e3), "");
-  static_assert(safe_cmp::Eq(13u, e3), "");
-  static_assert(safe_cmp::Eq(13, e4), "");
-  static_assert(safe_cmp::Eq(13u, e4), "");
+  static_assert(SafeEq(13, e1), "");
+  static_assert(SafeEq(13u, e1), "");
+  static_assert(SafeEq(13, e2), "");
+  static_assert(SafeEq(13u, e2), "");
+  static_assert(SafeEq(13, e3), "");
+  static_assert(SafeEq(13u, e3), "");
+  static_assert(SafeEq(13, e4), "");
+  static_assert(SafeEq(13u, e4), "");
 }
 
 }  // namespace rtc