diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-07-20 01:51:48 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-07-20 01:51:48 +0000 |
| commit | 3bf90e7811188701cfad18f091956bea4853ec51 (patch) | |
| tree | bbb8b6b8aaed98976c6060d20a710dca4d67d972 /libcxx/include/experimental | |
| parent | 41cdcbeedd761c6b9d349ce868e683cfcfef280f (diff) | |
| download | bcm5719-llvm-3bf90e7811188701cfad18f091956bea4853ec51.tar.gz bcm5719-llvm-3bf90e7811188701cfad18f091956bea4853ec51.zip | |
Fix two test failures in <experimental/filesystem>
First, <experimental/filesystem> didn't correctly guard
against min/max macros. This adds the proper push/pop macro guards.
Second, an internal time helper had been renamed but the test for
it hadn't been updated. This patch updates those tests.
llvm-svn: 337520
Diffstat (limited to 'libcxx/include/experimental')
| -rw-r--r-- | libcxx/include/experimental/filesystem | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/include/experimental/filesystem b/libcxx/include/experimental/filesystem index 6481aa680a2..2d2c1176516 100644 --- a/libcxx/include/experimental/filesystem +++ b/libcxx/include/experimental/filesystem @@ -251,6 +251,9 @@ #pragma GCC system_header #endif +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + #define __cpp_lib_experimental_filesystem 201406 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL_FILESYSTEM @@ -2647,4 +2650,6 @@ recursive_directory_iterator end(const recursive_directory_iterator&) _NOEXCEPT _LIBCPP_END_NAMESPACE_EXPERIMENTAL_FILESYSTEM +_LIBCPP_POP_MACROS + #endif // _LIBCPP_EXPERIMENTAL_FILESYSTEM |
