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

Rename a couple variables to eliminate a shadow warning. No functionality change

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@309881 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-08-02 20:29:26 +00:00
parent db84e0edae
commit 4aee06b818
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/experimental/filesystem/operations.cpp
View File

@@ -182,20 +182,20 @@ void __copy(const path& from, const path& to, copy_options options,
const bool sym_status2 = bool(options & const bool sym_status2 = bool(options &
copy_options::copy_symlinks); copy_options::copy_symlinks);
std::error_code m_ec; std::error_code m_ec1;
struct ::stat f_st = {}; struct ::stat f_st = {};
const file_status f = sym_status || sym_status2 const file_status f = sym_status || sym_status2
? detail::posix_lstat(from, f_st, &m_ec) ? detail::posix_lstat(from, f_st, &m_ec1)
: detail::posix_stat(from, f_st, &m_ec); : detail::posix_stat(from, f_st, &m_ec1);
if (m_ec) if (m_ec1)
return set_or_throw(m_ec, ec, "copy", from, to); return set_or_throw(m_ec1, ec, "copy", from, to);
struct ::stat t_st = {}; struct ::stat t_st = {};
const file_status t = sym_status ? detail::posix_lstat(to, t_st, &m_ec) const file_status t = sym_status ? detail::posix_lstat(to, t_st, &m_ec1)
: detail::posix_stat(to, t_st, &m_ec); : detail::posix_stat(to, t_st, &m_ec1);
if (not status_known(t)) if (not status_known(t))
return set_or_throw(m_ec, ec, "copy", from, to); return set_or_throw(m_ec1, ec, "copy", from, to);
if (!exists(f) || is_other(f) || is_other(t) if (!exists(f) || is_other(f) || is_other(t)
|| (is_directory(f) && is_regular_file(t)) || (is_directory(f) && is_regular_file(t))
@@ -249,9 +249,9 @@ void __copy(const path& from, const path& to, copy_options options,
directory_iterator it = ec ? directory_iterator(from, *ec) directory_iterator it = ec ? directory_iterator(from, *ec)
: directory_iterator(from); : directory_iterator(from);
if (ec && *ec) { return; } if (ec && *ec) { return; }
std::error_code m_ec; std::error_code m_ec2;
for (; it != directory_iterator(); it.increment(m_ec)) { for (; it != directory_iterator(); it.increment(m_ec2)) {
if (m_ec) return set_or_throw(m_ec, ec, "copy", from, to); if (m_ec2) return set_or_throw(m_ec2, ec, "copy", from, to);
__copy(it->path(), to / it->path().filename(), __copy(it->path(), to / it->path().filename(),
options | copy_options::__in_recursive_copy, ec); options | copy_options::__in_recursive_copy, ec);
if (ec && *ec) { return; } if (ec && *ec) { return; }