diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2019-11-19 18:48:43 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-11-19 18:48:43 +0000 |
| commit | 23ebd3daa3a9ca8f5a1a495caa9e1bb1bc4563cf (patch) | |
| tree | c9aa4e5ecbbe4bf04b0a583515c735d1dcca6a4c /src | |
| parent | 40f33dfd50048b67967a5013630e50aa645d0749 (diff) | |
| download | mongo-23ebd3daa3a9ca8f5a1a495caa9e1bb1bc4563cf.tar.gz | |
SERVER-44270 Compilation fails with --libc++ and clang 8.0+
(cherry picked from commit aac59681b3ae4d3806174227ba4c88aaf8e89ea2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/stdx/new.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/stdx/new.h b/src/mongo/stdx/new.h index 1fd7afbf6dd..1219454df11 100644 --- a/src/mongo/stdx/new.h +++ b/src/mongo/stdx/new.h @@ -37,7 +37,9 @@ namespace mongo { namespace stdx { -#if __cplusplus < 201703L || !defined(__cpp_lib_hardware_interference_size) +// libc++ 8.0 and later define __cpp_lib_hardware_interference_size but don't actually implement it +#if __cplusplus < 201703L || \ + !(defined(__cpp_lib_hardware_interference_size) && !defined(_LIBCPP_VERSION)) #if defined(MONGO_CONFIG_MAX_EXTENDED_ALIGNMENT) static_assert(MONGO_CONFIG_MAX_EXTENDED_ALIGNMENT >= sizeof(uint64_t), "Bad extended alignment"); |