From 26b789f9a53d086c8b8c9c2668efb251e37861cd Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Fri, 4 May 2018 09:58:56 -0700
Subject:   - 07191b0f52301e1e4a790e236f7b7c2fd90561ae Disambiguates computed
 return type of absl::optional logi... by Abseil Team <absl-team@google.com>  
 - acd95f8ec4e6ec1587cb198c7f40af3c81094d92 Release container benchmarks. by
 Alex Strelnikov <strel@google.com>   -
 80f596b6b7c5e06453e778c16527d5a0e85f8413 Allow
 absl::base_internal::AtomicHook to have a default v... by Derek Mauro
 <dmauro@google.com>   - 8402631546af8bcbd4acdf897d0cdfb805ad544a Release
 thread_identity benchmark. by Alex Strelnikov <strel@google.com>   -
 6dcb1e90fefb8556ce4654983d3a73c7585b4b99 Fix spelling error in variant.h by
 Abseil Team <absl-team@google.com>   -
 faa8a81e1442018c0d400b09a595a5be55074715 Run tests from CMake.  The CI is
 currently Linux only, fo... by Jon Cohen <cohenjon@google.com>   -
 745ed6db574f931f2ec3a88e964fb03a5f22f816 Internal change. by Derek Mauro
 <dmauro@google.com>   - 23facd7d1c5f43ac8181b016ee4acc5955f048c1
 absl::variant exception safety test. by Xiaoyi Zhang <zhangxy@google.com>   -
 c18e21e7cf8f6e83ae9d90e536e886409dd6cf68 Reinstate the syntax check on
 time-zone abbreviations now... by Abseil Team <absl-team@google.com>   -
 da469f4314f0c820665a2b5b9477af9462b23e42 Import CCTZ changes to internal
 copy. by Shaindel Schwartz <shaindel@google.com>   -
 44ea35843517be03ab256b69449ccfea64352621 Import CCTZ changes to internal
 copy. by Abseil Team <absl-team@google.com>   -
 55d1105312687c6093950fac831c7540f49045b5 Import CCTZ changes to internal
 copy. by Greg Falcon <gfalcon@google.com>   -
 58d7965ad274406410b6d833213eca04d41c6867 Add zoneinfo as a data dependency to
 the //absl/time tests. by Shaindel Schwartz <shaindel@google.com>   -
 6acc50146f9ff29015bfaaa5bf9900691f839da5 Change benchmark target type from
 cc_test to cc_binary. by Alex Strelnikov <strel@google.com>   -
 db3fbdae8f9f285a466f7a070326b1ce43b6a0dd Update WORKSPACE for C++
 microbenchmarks and release algo... by Alex Strelnikov <strel@google.com>   -
 0869ae168255242af651853ed01719166d8cebf6 Update to Bazel version 0.13.0. by
 Abseil Team <absl-team@google.com>   -
 e507dd53ab788964207fdf27d31b72a33c296fab Add missing include of cstdio by
 Abseil Team <absl-team@google.com>

GitOrigin-RevId: 07191b0f52301e1e4a790e236f7b7c2fd90561ae
Change-Id: I90994cf2b438fbec894724dcd9b90882281eef56
---
 absl/time/internal/cctz/include/cctz/civil_time_detail.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'absl/time/internal/cctz/include')

diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
index 4c39c7d120e6..d52eddcdba06 100644
--- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h
+++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
@@ -20,8 +20,8 @@
 #include <ostream>
 #include <type_traits>
 
-// Disable constexpr support unless we are using clang in C++14 mode.
-#if __clang__ && __cpp_constexpr >= 201304
+// Disable constexpr support unless we are in C++14 mode.
+#if __cpp_constexpr >= 201304 || _MSC_VER >= 1910
 #define CONSTEXPR_D constexpr  // data
 #define CONSTEXPR_F constexpr  // function
 #define CONSTEXPR_M constexpr  // member
-- 
cgit 1.4.1