| Index: base/numerics/safe_numerics_unittest.cc
|
| diff --git a/base/numerics/safe_numerics_unittest.cc b/base/numerics/safe_numerics_unittest.cc
|
| index 81873ea2eba76976d045d968a2b6255a571fbd2b..aaf277947180c4eb22a8e5ee8f965706a5beda78 100644
|
| --- a/base/numerics/safe_numerics_unittest.cc
|
| +++ b/base/numerics/safe_numerics_unittest.cc
|
| @@ -8,6 +8,7 @@
|
| #include <stdint.h>
|
|
|
| #include <limits>
|
| +#include <type_traits>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/numerics/safe_conversions.h"
|
| @@ -30,7 +31,6 @@ using base::internal::RANGE_INVALID;
|
| using base::internal::RANGE_OVERFLOW;
|
| using base::internal::RANGE_UNDERFLOW;
|
| using base::internal::SignedIntegerForSize;
|
| -using base::enable_if;
|
|
|
| // These tests deliberately cause arithmetic overflows. If the compiler is
|
| // aggressive enough, it can const fold these overflows. Disable warnings about
|
| @@ -76,9 +76,9 @@ template <typename Dst>
|
| static void TestSpecializedArithmetic(
|
| const char* dst,
|
| int line,
|
| - typename enable_if<
|
| - numeric_limits<Dst>::is_integer&& numeric_limits<Dst>::is_signed,
|
| - int>::type = 0) {
|
| + typename std::enable_if<numeric_limits<Dst>::is_integer &&
|
| + numeric_limits<Dst>::is_signed,
|
| + int>::type = 0) {
|
| typedef numeric_limits<Dst> DstLimits;
|
| TEST_EXPECTED_VALIDITY(RANGE_OVERFLOW,
|
| -CheckedNumeric<Dst>(DstLimits::min()));
|
| @@ -132,9 +132,9 @@ template <typename Dst>
|
| static void TestSpecializedArithmetic(
|
| const char* dst,
|
| int line,
|
| - typename enable_if<
|
| - numeric_limits<Dst>::is_integer && !numeric_limits<Dst>::is_signed,
|
| - int>::type = 0) {
|
| + typename std::enable_if<numeric_limits<Dst>::is_integer &&
|
| + !numeric_limits<Dst>::is_signed,
|
| + int>::type = 0) {
|
| typedef numeric_limits<Dst> DstLimits;
|
| TEST_EXPECTED_VALIDITY(RANGE_VALID, -CheckedNumeric<Dst>(DstLimits::min()));
|
| TEST_EXPECTED_VALIDITY(RANGE_VALID,
|
| @@ -172,7 +172,7 @@ template <typename Dst>
|
| void TestSpecializedArithmetic(
|
| const char* dst,
|
| int line,
|
| - typename enable_if<numeric_limits<Dst>::is_iec559, int>::type = 0) {
|
| + typename std::enable_if<numeric_limits<Dst>::is_iec559, int>::type = 0) {
|
| typedef numeric_limits<Dst> DstLimits;
|
| TEST_EXPECTED_VALIDITY(RANGE_VALID, -CheckedNumeric<Dst>(DstLimits::min()));
|
|
|
|
|