Author: ericwf
Date: Thu Jul 19 18:51:48 2018
New Revision: 337520
URL: http://llvm.org/viewvc/llvm-project?rev=337520&view=rev
Log:
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.
Modified:
libcxx/trunk/include/experimental/filesystem
libcxx/trunk/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp
Modified: libcxx/trunk/include/experimental/filesystem
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/experimental/filesystem?rev=337520&r1=337519&r2=337520&view=diff
==============================================================================
--- libcxx/trunk/include/experimental/filesystem (original)
+++ libcxx/trunk/include/experimental/filesystem Thu Jul 19 18:51:48 2018
@@ -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 r
_LIBCPP_END_NAMESPACE_EXPERIMENTAL_FILESYSTEM
+_LIBCPP_POP_MACROS
+
#endif // _LIBCPP_EXPERIMENTAL_FILESYSTEM
Modified:
libcxx/trunk/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp?rev=337520&r1=337519&r2=337520&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp
(original)
+++ libcxx/trunk/test/libcxx/experimental/filesystem/convert_file_time.sh.cpp
Thu Jul 19 18:51:48 2018
@@ -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 };
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
