public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/aoliva/heads/testme)] always save path for _At_path
Date: Mon, 27 Jun 2022 13:35:49 +0000 (GMT)	[thread overview]
Message-ID: <20220627133549.74481384147A@sourceware.org> (raw)

https://gcc.gnu.org/g:dc5b848f45ac774e10e2480689f2532ac4a42261

commit dc5b848f45ac774e10e2480689f2532ac4a42261
Author: Alexandre Oliva <oliva@gnu.org>
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:


             reply	other threads:[~2022-06-27 13:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-27 13:35 Alexandre Oliva [this message]
2022-06-27 18:09 Alexandre Oliva

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220627133549.74481384147A@sourceware.org \
    --to=aoliva@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).