X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=ceph%2Fsrc%2Fboost%2Fboost%2Ffilesystem%2Fdirectory.hpp;h=7dcb99d92f2d794f58379771d84ca42c3db861f0;hb=20effc670b57271cb089376d6d0800990e5218d5;hp=90dcaa885bf486a3aaecbbfdef65e02e9e78fe2d;hpb=a71831dadd1e1f3e0fa70405511f65cc33db0498;p=ceph.git

diff --git a/ceph/src/boost/boost/filesystem/directory.hpp b/ceph/src/boost/boost/filesystem/directory.hpp
index 90dcaa885..7dcb99d92 100644
--- a/ceph/src/boost/boost/filesystem/directory.hpp
+++ b/ceph/src/boost/boost/filesystem/directory.hpp
@@ -162,18 +162,26 @@ private:
 //  - a conversion to 'path' using 'operator const boost::filesystem::path&()',
 //  - then a call to 'is_directory(const path& p)' which recomputes the status with 'detail::status(p)'.
 //
-//  These functions avoid a costly recomputation of the status if one calls 'is_directory(e)' instead of 'is_directory(e.status)'
-
-inline file_status status         (const directory_entry& e) BOOST_NOEXCEPT { return e.status(); }
-inline bool        type_present   (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::type_present(e.status()); }
-inline bool        status_known   (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::status_known(e.status()); }
-inline bool        exists         (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::exists(e.status()); }
-inline bool        is_regular_file(const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_regular_file(e.status()); }
-inline bool        is_directory   (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_directory(e.status()); }
-inline bool        is_symlink     (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_symlink(e.status()); }
-inline bool        is_other       (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_other(e.status()); }
+//  These functions avoid a costly recomputation of the status if one calls 'is_directory(e)' instead of 'is_directory(e.status())'
+
+inline file_status status         (const directory_entry& e) { return e.status(); }
+inline file_status status         (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return e.status(ec); }
+inline bool        type_present   (const directory_entry& e) { return filesystem::type_present(e.status()); }
+inline bool        type_present   (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::type_present(e.status(ec)); }
+inline bool        status_known   (const directory_entry& e) { return filesystem::status_known(e.status()); }
+inline bool        status_known   (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::status_known(e.status(ec)); }
+inline bool        exists         (const directory_entry& e) { return filesystem::exists(e.status()); }
+inline bool        exists         (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::exists(e.status(ec)); }
+inline bool        is_regular_file(const directory_entry& e) { return filesystem::is_regular_file(e.status()); }
+inline bool        is_regular_file(const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::is_regular_file(e.status(ec)); }
+inline bool        is_directory   (const directory_entry& e) { return filesystem::is_directory(e.status()); }
+inline bool        is_directory   (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::is_directory(e.status(ec)); }
+inline bool        is_symlink     (const directory_entry& e) { return filesystem::is_symlink(e.symlink_status()); }
+inline bool        is_symlink     (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::is_symlink(e.symlink_status(ec)); }
+inline bool        is_other       (const directory_entry& e) { return filesystem::is_other(e.status()); }
+inline bool        is_other       (const directory_entry& e, system::error_code& ec) BOOST_NOEXCEPT { return filesystem::is_other(e.status(ec)); }
 #ifndef BOOST_FILESYSTEM_NO_DEPRECATED
-inline bool        is_regular     (const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_regular(e.status()); }
+inline bool        is_regular     (const directory_entry& e) { return filesystem::is_regular(e.status()); }
 #endif
 
 //--------------------------------------------------------------------------------------//