public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/aoliva/heads/testme)] always save path for _At_path
@ 2022-06-27 13:35 Alexandre Oliva
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2022-06-27 13:35 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

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:


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gcc(refs/users/aoliva/heads/testme)] always save path for _At_path
@ 2022-06-27 18:09 Alexandre Oliva
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2022-06-27 18:09 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

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

commit b942b4bb13fc862e39a55759c8df0222aa8dffe5
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Mon Jun 27 12:07:22 2022 -0300

    always save path for _At_path

Diff:
---
 libstdc++-v3/src/c++17/fs_dir.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/src/c++17/fs_dir.cc b/libstdc++-v3/src/c++17/fs_dir.cc
index 87f947e9e37..e58067852f8 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 && _GLIBCXX_HAVE_UNLINKAT && _GLIBCXX_HAVE_OPENAT
     if (filename_only)
       return; // Do not store path p when we aren't going to use it.
 #endif


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-27 18:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-27 13:35 [gcc(refs/users/aoliva/heads/testme)] always save path for _At_path Alexandre Oliva
2022-06-27 18:09 Alexandre Oliva

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).