diff options
| author | Abseil Team <absl-team@google.com> | 2019-03-05T02·05-0800 |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2019-03-05T18·09-0500 |
| commit | 9fdf5e5b805412cb2a2e624d3e9a11588120465f (patch) | |
| tree | 2d0025ab1b3e2e90e724f6073b821b1b2cf69aeb /absl/base | |
| parent | 419f3184f8ebcdb23105295eadd2a569f3351eb9 (diff) | |
Export of internal Abseil changes.
-- 425305bdac5c84a2b7b61d65aee90e4d9d1c29a0 by Abseil Team <absl-team@google.com>: Change a comment about hex strings to use lowercase 'a' and 'f' characters, since StrCat(Hex()) produces lowercase hex characters. PiperOrigin-RevId: 236763001 -- 2a312da1c2e46da3bdece0c322c4cd37356bb9aa by Samuel Benzaquen <sbenza@google.com>: Enable more tests for non-std containers by default. Add more tests for typedefs and other members. PiperOrigin-RevId: 236652269 -- 5d5abd4d8e8e03d3c924675550a9584325b18732 by Eric Fiselier <ericwf@google.com>: Fix incorrect detection of unavailable C++17 types. Using <any> on OS X has complications, because it is present but marked "unavailable" due to dylib compatibility reasons. The dance we did to detect availability was correct on OS X, but accidentally clobbered all other platforms for not being Apple. This patch corrects the detection. PiperOrigin-RevId: 236651217 GitOrigin-RevId: 425305bdac5c84a2b7b61d65aee90e4d9d1c29a0 Change-Id: Ib922ce003422781aec169ea169d8fb15292ccd85
Diffstat (limited to 'absl/base')
| -rw-r--r-- | absl/base/config.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index eb0d79dfe39f..e2ef5e4c6f35 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -371,10 +371,10 @@ // https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes #if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \ defined(__MAC_OS_X_VERSION_MIN_REQUIRED__) && \ - __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400 -#define ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES 1 + __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400 +#define ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE 1 #else -#define ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES 0 +#define ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE 0 #endif // ABSL_HAVE_STD_ANY @@ -386,7 +386,7 @@ #ifdef __has_include #if __has_include(<any>) && __cplusplus >= 201703L && \ - ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES + !ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE #define ABSL_HAVE_STD_ANY 1 #endif #endif @@ -400,7 +400,7 @@ #ifdef __has_include #if __has_include(<optional>) && __cplusplus >= 201703L && \ - ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES + !ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE #define ABSL_HAVE_STD_OPTIONAL 1 #endif #endif @@ -414,7 +414,7 @@ #ifdef __has_include #if __has_include(<variant>) && __cplusplus >= 201703L && \ - ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES + !ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE #define ABSL_HAVE_STD_VARIANT 1 #endif #endif |