From 92020a042c0cd46979db9f6f0cb32783dc07765e Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Fri, 8 Jun 2018 08:14:48 -0700
Subject:   - abacaab4b11a69dd4db627bd183571d7cabb8def Refinement to previous
 time.h edit (in this same github p... by Greg Falcon <gfalcon@google.com>   -
 64db19b773134c6c8004e3b23c9ca892efbf8bae Move SpinLock's adaptive spin count
 computation from a st... by Derek Mauro <dmauro@google.com>   -
 6f9533fb44a52485a7c2bbb9b4efc7bf8d6c359a Import of CCTZ from GitHub. by
 Abseil Team <absl-team@google.com>   -
 a211d7255c986e8dd4ceada362c0d054a6a1969a Cleanup exception flags by Abseil
 Team <absl-team@google.com>   - babdb29c590126fe9bba5229fe91034b5b5c358a
 Release time benchmarks. by Alex Strelnikov <strel@google.com>   -
 5803b32a3ff123d1fb57a0c471d199c818357c9f Release memutil microbenchmarks. by
 Alex Strelnikov <strel@google.com>   -
 5357d4890d30e80c53beb05af32500fb20e9402b Add parens around expansion of
 ABSL_PREDICT_{FALSE,TRUE} ... by Abseil Team <absl-team@google.com>   -
 32023f61a239a5f6b1c59e577bfe81b179bbcd2d Reformat build rule tag. by Alex
 Strelnikov <strel@google.com>   - 833758ecf2b0cf7a42bbd50b5b127e416425c168
 Release uint128 microbenchmarks. by Alex Strelnikov <strel@google.com>   -
 c115a9bca1f944b90fdc78a56b2de176466b124f Disambiguate bitwise-not of
 size_type by Abseil Team <absl-team@google.com>   -
 f6905f5b5f6e425792de646edafde440548d9346 Updates ConstructorTracker and
 TrackedObjects with 1) a m... by Abseil Team <absl-team@google.com>   -
 147c553bdd5d2db20a38f75c4d1ef973d6c709c5 Changes the absl::Duration factory
 functions to disallow ... by Greg Miller <jgm@google.com>   -
 dba2b96d11b5264546b283ba452f2de1303b0f07 White space fix by Alex Strelnikov
 <strel@google.com>

GitOrigin-RevId: abacaab4b11a69dd4db627bd183571d7cabb8def
Change-Id: I6fa34f20d0b2f898e7b5475a603111413bb80a67
---
 absl/time/duration_test.cc | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'absl/time/duration_test.cc')

diff --git a/absl/time/duration_test.cc b/absl/time/duration_test.cc
index 7918e16..704684e 100644
--- a/absl/time/duration_test.cc
+++ b/absl/time/duration_test.cc
@@ -330,18 +330,10 @@ TEST(Duration, ToChrono) {
   EXPECT_EQ(hours::max(), absl::ToChronoHours(inf));
 }
 
-// Used for testing the factory overloads.
-template <typename T>
-struct ImplicitlyConvertible {
-  T n_;
-  explicit ImplicitlyConvertible(T n) : n_(n) {}
-  // Marking this conversion operator with 'explicit' will cause the test to
-  // fail (as desired).
-  operator T() { return n_; }
-};
-
 TEST(Duration, FactoryOverloads) {
+  enum E { kOne = 1 };
 #define TEST_FACTORY_OVERLOADS(NAME)                                          \
+  EXPECT_EQ(1, NAME(kOne) / NAME(kOne));                                      \
   EXPECT_EQ(1, NAME(static_cast<int8_t>(1)) / NAME(1));                       \
   EXPECT_EQ(1, NAME(static_cast<int16_t>(1)) / NAME(1));                      \
   EXPECT_EQ(1, NAME(static_cast<int32_t>(1)) / NAME(1));                      \
@@ -350,14 +342,6 @@ TEST(Duration, FactoryOverloads) {
   EXPECT_EQ(1, NAME(static_cast<uint16_t>(1)) / NAME(1));                     \
   EXPECT_EQ(1, NAME(static_cast<uint32_t>(1)) / NAME(1));                     \
   EXPECT_EQ(1, NAME(static_cast<uint64_t>(1)) / NAME(1));                     \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<int8_t>(1)) / NAME(1));             \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<int16_t>(1)) / NAME(1));            \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<int32_t>(1)) / NAME(1));            \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<int64_t>(1)) / NAME(1));            \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<uint8_t>(1)) / NAME(1));            \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<uint16_t>(1)) / NAME(1));           \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<uint32_t>(1)) / NAME(1));           \
-  EXPECT_EQ(1, NAME(ImplicitlyConvertible<uint64_t>(1)) / NAME(1));           \
   EXPECT_EQ(NAME(1) / 2, NAME(static_cast<float>(0.5)));                      \
   EXPECT_EQ(NAME(1) / 2, NAME(static_cast<double>(0.5)));                     \
   EXPECT_EQ(1.5, absl::FDivDuration(NAME(static_cast<float>(1.5)), NAME(1))); \
-- 
cgit v1.2.3