From 77a87b2a0e5fb069107479d1e2bd3efafd6bd3ab Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 10 May 2016 14:09:22 +0100 Subject: [PATCH] Optimize __directory_iterator_proxy for the common case * include/experimental/bits/fs_dir.h (__directory_iterator_proxy): Overload operator* to move from rvalues. From-SVN: r236078 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/experimental/bits/fs_dir.h | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 20c55ff4d5e..7aaeefaa518 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-05-10 Jonathan Wakely + * include/experimental/bits/fs_dir.h (__directory_iterator_proxy): + Overload operator* to move from rvalues. + PR libstdc++/71036 * src/filesystem/ops.cc (create_dir): Handle EEXIST from mkdir. * testsuite/experimental/filesystem/operations/create_directory.cc: diff --git a/libstdc++-v3/include/experimental/bits/fs_dir.h b/libstdc++-v3/include/experimental/bits/fs_dir.h index 5fd41c2127f..011d3981622 100644 --- a/libstdc++-v3/include/experimental/bits/fs_dir.h +++ b/libstdc++-v3/include/experimental/bits/fs_dir.h @@ -158,7 +158,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 struct __directory_iterator_proxy { - const directory_entry& operator*() const noexcept { return _M_entry; } + const directory_entry& operator*() const& noexcept { return _M_entry; } + + directory_entry operator*() && noexcept { return std::move(_M_entry); } private: friend class directory_iterator; -- 2.30.2