summaryrefslogtreecommitdiffstats
path: root/libcxx/src/experimental/filesystem
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-07-23 21:52:29 +0000
committerEric Fiselier <eric@efcs.ca>2018-07-23 21:52:29 +0000
commit5a16f861e9cbb2e79012d7a6228ea8e68bec3f26 (patch)
treee36ce857cb4245e9a2994ffde9ae03956d8067a0 /libcxx/src/experimental/filesystem
parentb00fb46479a3f9217408e007b02bb2200e7d6a19 (diff)
downloadbcm5719-llvm-5a16f861e9cbb2e79012d7a6228ea8e68bec3f26.tar.gz
bcm5719-llvm-5a16f861e9cbb2e79012d7a6228ea8e68bec3f26.zip
Revert "Use possibly cached directory entry values when performing recursive directory iteration."
This reverts commit 04ce4aef00d3ee508327f6cf7bf1b1d200ab6238. llvm-svn: 337749
Diffstat (limited to 'libcxx/src/experimental/filesystem')
-rw-r--r--libcxx/src/experimental/filesystem/directory_iterator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/experimental/filesystem/directory_iterator.cpp b/libcxx/src/experimental/filesystem/directory_iterator.cpp
index 7b485b4c6d3..a6f10d07565 100644
--- a/libcxx/src/experimental/filesystem/directory_iterator.cpp
+++ b/libcxx/src/experimental/filesystem/directory_iterator.cpp
@@ -359,13 +359,13 @@ bool recursive_directory_iterator::__try_recursion(error_code *ec) {
bool skip_rec = false;
error_code m_ec;
if (!rec_sym) {
- file_status st(curr_it.__entry_.__get_sym_ft(&m_ec));
+ file_status st = curr_it.__entry_.symlink_status(m_ec);
if (m_ec && status_known(st))
m_ec.clear();
if (m_ec || is_symlink(st) || !is_directory(st))
skip_rec = true;
} else {
- file_status st(curr_it.__entry_.__get_ft(&m_ec));
+ file_status st = curr_it.__entry_.status(m_ec);
if (m_ec && status_known(st))
m_ec.clear();
if (m_ec || !is_directory(st))
OpenPOWER on IntegriCloud