diff options
| -rw-r--r-- | libcxx/include/experimental/filesystem | 5 | ||||
| -rw-r--r-- | libcxx/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp | 2 |
2 files changed, 6 insertions, 1 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 diff --git a/libcxx/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp b/libcxx/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp index e418851d9cf..cc1696cea78 100644 --- a/libcxx/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp +++ b/libcxx/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp @@ -28,7 +28,7 @@ using namespace std::chrono; namespace fs = std::experimental::filesystem; using fs::file_time_type; -using fs::detail::fs_time_util; +using fs::detail::time_util::fs_time_util; enum TestKind { TK_64Bit, TK_32Bit, TK_FloatingPoint }; |
