diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-10-01 04:08:06 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-10-01 04:08:06 +0000 |
| commit | b6f4d445f07b0a8ddb25f1be8d511d60cde05c37 (patch) | |
| tree | 987dfb12b796e9dbb4539ff0cc23f96834f978b3 /libcxx/include/new | |
| parent | 1f44fda0b9ed3c3f5e44a7d73f98c420da48a17a (diff) | |
| download | bcm5719-llvm-b6f4d445f07b0a8ddb25f1be8d511d60cde05c37.tar.gz bcm5719-llvm-b6f4d445f07b0a8ddb25f1be8d511d60cde05c37.zip | |
Attempt to fix aligned allocation configuration under clang-cl
When we're using clang-cl and Microsoft's runtime implementation,
we don't provide align_val_t or aligned new/delete ourselves.
This patch updates the _LIBCPP_HAS_NO_ALIGNED_ALLOCATION macro
to reflect this.
llvm-svn: 343441
Diffstat (limited to 'libcxx/include/new')
| -rw-r--r-- | libcxx/include/new | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxx/include/new b/libcxx/include/new index 8d72ba5c880..7c3076c01a3 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -171,6 +171,10 @@ enum class _LIBCPP_ENUM_VIS align_val_t : size_t { }; enum align_val_t { __zero = 0, __max = (size_t)-1 }; #endif #endif +#elif !defined(__cpp_aligned_new) +// We're defering to Microsoft's STL to provide aligned new et al. We don't +// have it unless the language feature test macro is defined. +#define _LIBCPP_HAS_NO_ALIGNED_ALLOCATION #endif } // std |
