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

webrtc/base/checks.h

 /*
  *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 81 matching lines @@
 // condition being unused).
 #define RTC_EAT_STREAM_PARAMETERS(ignored) \
   (true ? true : ((void)(ignored), true))  \
       ? static_cast<void>(0)               \
       : rtc::FatalMessageVoidify() & rtc::FatalMessage("", 0).stream()
 
 // Call RTC_EAT_STREAM_PARAMETERS with an argument that fails to compile if
 // values of the same types as |a| and |b| can't be compared with the given
 // operation, and that would evaluate |a| and |b| if evaluated.
 #define RTC_EAT_STREAM_PARAMETERS_OP(op, a, b) \
-  RTC_EAT_STREAM_PARAMETERS(((void)rtc::safe_cmp::op(a, b)))
+  RTC_EAT_STREAM_PARAMETERS(((void)rtc::Safe##op(a, b)))
 
 // RTC_CHECK dies with a fatal error if condition is not true. It is *not*
 // controlled by NDEBUG or anything else, so the check will be executed
 // regardless of compilation mode.
 //
 // We make sure RTC_CHECK et al. always evaluates their arguments, as
 // doing RTC_CHECK(FunctionWithSideEffect()) is a common idiom.
 #define RTC_CHECK(condition)                                      \
   RTC_LAZY_STREAM(rtc::FatalMessage(__FILE__, __LINE__).stream(), \
                   !(condition))                                   \
@@ skipping 42 matching lines @@
 #endif
 
 // Helper functions for RTC_CHECK_OP macro.
 // The (int, int) specialization works around the issue that the compiler
 // will not instantiate the template version of the function on values of
 // unnamed enum type - see comment below.
 #define DEFINE_RTC_CHECK_OP_IMPL(name)                                       \
   template <class t1, class t2>                                              \
   inline std::string* Check##name##Impl(const t1& v1, const t2& v2,          \
                                         const char* names) {                 \
-    if (rtc::safe_cmp::name(v1, v2))                                         \
+    if (rtc::Safe##name(v1, v2))                                             \
       return nullptr;                                                        \
     else                                                                     \
       return rtc::MakeCheckOpString(v1, v2, names);                          \
   }                                                                          \
   inline std::string* Check##name##Impl(int v1, int v2, const char* names) { \
-    if (rtc::safe_cmp::name(v1, v2))                                         \
+    if (rtc::Safe##name(v1, v2))                                             \
       return nullptr;                                                        \
     else                                                                     \
       return rtc::MakeCheckOpString(v1, v2, names);                          \
   }
 DEFINE_RTC_CHECK_OP_IMPL(Eq)
 DEFINE_RTC_CHECK_OP_IMPL(Ne)
 DEFINE_RTC_CHECK_OP_IMPL(Le)
 DEFINE_RTC_CHECK_OP_IMPL(Lt)
 DEFINE_RTC_CHECK_OP_IMPL(Ge)
 DEFINE_RTC_CHECK_OP_IMPL(Gt)
@@ skipping 98 matching lines @@
 #define RTC_DCHECK_EQ(a, b) RTC_DCHECK((a) == (b))
 #define RTC_DCHECK_NE(a, b) RTC_DCHECK((a) != (b))
 #define RTC_DCHECK_LE(a, b) RTC_DCHECK((a) <= (b))
 #define RTC_DCHECK_LT(a, b) RTC_DCHECK((a) < (b))
 #define RTC_DCHECK_GE(a, b) RTC_DCHECK((a) >= (b))
 #define RTC_DCHECK_GT(a, b) RTC_DCHECK((a) > (b))
 
 #endif  // __cplusplus
 
 #endif  // WEBRTC_BASE_CHECKS_H_