From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 74481384147A; Mon, 27 Jun 2022 13:35:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74481384147A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] always save path for _At_path X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: b48f65918a6797ce8024d19412762b742d875405 X-Git-Newrev: dc5b848f45ac774e10e2480689f2532ac4a42261 Message-Id: <20220627133549.74481384147A@sourceware.org> Date: Mon, 27 Jun 2022 13:35:49 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2022 13:35:49 -0000 https://gcc.gnu.org/g:dc5b848f45ac774e10e2480689f2532ac4a42261 commit dc5b848f45ac774e10e2480689f2532ac4a42261 Author: Alexandre Oliva Date: Mon Jun 27 09:14:05 2022 -0300 always save path for _At_path Diff: --- libstdc++-v3/src/c++17/fs_dir.cc | 2 +- libstdc++-v3/src/c++17/fs_ops.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_dir.cc b/libstdc++-v3/src/c++17/fs_dir.cc index fb752239e1f..63ec314bebd 100644 --- a/libstdc++-v3/src/c++17/fs_dir.cc +++ b/libstdc++-v3/src/c++17/fs_dir.cc @@ -48,7 +48,7 @@ struct fs::_Dir : _Dir_base [[maybe_unused]] bool filename_only, error_code& ec) : _Dir_base(p.c_str(), skip_permission_denied, nofollow, ec) { -#if _GLIBCXX_HAVE_DIRFD +#if _GLIBCXX_HAVE_DIRFD /* && 0 */ if (filename_only) return; // Do not store path p when we aren't going to use it. #endif diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index de99e02af4c..47d20cd8fea 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -1288,7 +1288,7 @@ fs::remove_all(const path& p) uintmax_t count = 0; retry: uintmax_t init_count = count; - recursive_directory_iterator dir(p, directory_options{64|128}, ec); + recursive_directory_iterator dir(p, directory_options{64/*|128*/}, ec); switch (ec.value()) // N.B. assumes ec.category() == std::generic_category() { case 0: @@ -1346,7 +1346,7 @@ fs::remove_all(const path& p, error_code& ec) uintmax_t count = 0; retry: uintmax_t init_count = count; - recursive_directory_iterator dir(p, directory_options{64|128}, ec); + recursive_directory_iterator dir(p, directory_options{64/*|128*/}, ec); switch (ec.value()) // N.B. assumes ec.category() == std::generic_category() { case 0: