Merge pull request #340 from jtsylve/macos_cxx17_fix

Fixed ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE check
This commit is contained in:
Matt Calabrese 2019-07-08 16:04:28 -04:00 committed by GitHub
commit 3c98fcc046
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -375,7 +375,7 @@
// https://github.com/abseil/abseil-cpp/issues/207 and // https://github.com/abseil/abseil-cpp/issues/207 and
// https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes // https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
#if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \ #if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \
defined(__MAC_OS_X_VERSION_MIN_REQUIRED__) && \ defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400 __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400
#define ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE 1 #define ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE 1
#else #else