diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-07 03:01:24 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-07 03:01:24 +0000 |
| commit | 32b19c3d9fdde3d93288593ae7492ec837e87967 (patch) | |
| tree | 712d7a27e7eff4afe9c05a716f4b118fff043f94 /include/module.modulemap | |
| parent | cc1d780758e3759212d452e7d71da75bb3b2c076 (diff) | |
[libc++] Tolerate presence of __deallocate macro
Summary:
On Windows the identifier `__deallocate` is defined as a macro by one of the Windows system headers. Previously libc++ worked around this by `#undef __deallocate` and generating a warning. However this causes the WIN32 version of `__threading_support` to always generate a warning on Windows. This is not OK.
This patch renames all usages of `__deallocate` internally as to not conflict with the macro.
Reviewers: mclow.lists, majnemer, rnk, rsmith, smeenai, compnerd
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D28426
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291332 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/module.modulemap')
| -rw-r--r-- | include/module.modulemap | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/module.modulemap b/include/module.modulemap index 95610bfb7..c354cae1e 100644 --- a/include/module.modulemap +++ b/include/module.modulemap @@ -485,7 +485,6 @@ module std [system] { module __tree { header "__tree" export * } module __tuple { header "__tuple" export * } module __undef_min_max { header "__undef_min_max" export * } - module __undef___deallocate { header "__undef___deallocate" export * } module experimental { requires cplusplus11 |