diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-31 22:07:49 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-31 22:07:49 +0000 |
| commit | a016efb1dcda61e606e527b73791fbacf1bc9c86 (patch) | |
| tree | f98a8a9a31a14d8d72c4d549467288b5dce6e594 /libcxx/include/module.modulemap | |
| parent | 0b69e363f65b9207d42213f546a9e2fa55c503be (diff) | |
| download | bcm5719-llvm-a016efb1dcda61e606e527b73791fbacf1bc9c86.tar.gz bcm5719-llvm-a016efb1dcda61e606e527b73791fbacf1bc9c86.zip | |
[Libc++] Use #pragma push_macro/pop_macro to better handle min/max on Windows
Summary:
This patch improves how libc++ handles min/max macros within the headers. Previously libc++ would undef them and emit a warning.
This patch changes libc++ to use `#pragma push_macro` to save the macro before undefining it, and `#pragma pop_macro` to restore the macros and the end of the header.
Reviewers: mclow.lists, bcraig, compnerd, EricWF
Reviewed By: EricWF
Subscribers: cfe-commits, krytarowski
Differential Revision: https://reviews.llvm.org/D33080
llvm-svn: 304357
Diffstat (limited to 'libcxx/include/module.modulemap')
| -rw-r--r-- | libcxx/include/module.modulemap | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap index 98b1870afcc..3194b5c9f2a 100644 --- a/libcxx/include/module.modulemap +++ b/libcxx/include/module.modulemap @@ -484,7 +484,7 @@ module std [system] { module __string { header "__string" export * } module __tree { header "__tree" export * } module __tuple { header "__tuple" export * } - module __undef_min_max { header "__undef_min_max" export * } + module __undef_macros { header "__undef_macros" export * } module experimental { requires cplusplus11 |
