From d732f2014bdd141135e6af06ee5b47e7fbe4b877 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 5 Oct 2017 13:33:44 -0700 Subject: Changes imported from Abseil "staging" branch: - d5a5960a133967e4af02836d304884cd6cbd6e46 Adjusting time tests for flakiness by Gennadiy Civil - ccb8535fdc92c3c99bfa2795e75d3fbdcb134571 Internal-only tweak. by Jorg Brown - 4c03dd9e54bd4645e7e7a8dfb3c590f5b0654884 Fix comment on some C++11 type traits backport. by Xiaoyi Zhang - 43cd12d2304464163e33ae932fbb842a869213dd Allow intrinsic int128 to be set for __ppc64__ targets. by Abseil Team - 789e9c13de67ef3c7ba09c765c3484621897b6bb Update README.md description of 'types' library to be con... by Abseil Team - 8be10d7683c90b85244ddc67360a7ca2dfffdf01 Update comment on move constructors' noexcept specificati... by Xiaoyi Zhang GitOrigin-RevId: d5a5960a133967e4af02836d304884cd6cbd6e46 Change-Id: I743efee47b9e65f46a44d9ab80ccd62cfd0c1301 --- absl/base/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'absl/base') diff --git a/absl/base/config.h b/absl/base/config.h index 4aff4923..5f0dd04c 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -180,7 +180,7 @@ #ifdef ABSL_HAVE_INTRINSIC_INT128 #error ABSL_HAVE_INTRINSIC_INT128 cannot be directly set #elif (defined(__clang__) && defined(__SIZEOF_INT128__) && \ - !defined(__ppc64__) && !defined(__aarch64__)) || \ + !defined(__aarch64__)) || \ (defined(__CUDACC__) && defined(__SIZEOF_INT128__) && \ __CUDACC_VER__ >= 70000) || \ (!defined(__clang__) && !defined(__CUDACC__) && defined(__GNUC__) && \ -- cgit v1.2.3