LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two test failures in <experimental/filesystem>

Browse Source 
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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@337520 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2018-07-20 01:51:48 +00:00
parent 0f8ee948c3
commit 77c9cf44e3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/experimental/filesystem
View File

@@ -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

2
test/libcxx/experimental/filesystem/convert_file_time.sh.cpp
View File

@@ -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 };