From: Kefu Chai <kchai@redhat.com>
Date: Thu, 27 Aug 2020 13:01:37 +0000 (+0800)
Subject: crimson/common: do not check for experimental/filesystem anymore
X-Git-Tag: wip-pdonnell-testing-20200918.022351~205^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc72cce00ccfd10af6562f8facf3a234c8ffbc37;p=ceph-ci.git

crimson/common: do not check for experimental/filesystem anymore

seastar is only compatible with C++17 and C++20, so no need to check for
<experimental/filesystem> anymore. the C++ standard library should be
C++17 compatible.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/common/config_proxy.cc b/src/crimson/common/config_proxy.cc
index a853564038a..88d4679d573 100644
--- a/src/crimson/common/config_proxy.cc
+++ b/src/crimson/common/config_proxy.cc
@@ -3,20 +3,10 @@
 
 #include "config_proxy.h"
 
-#if __has_include(<filesystem>)
 #include <filesystem>
-#else
-#include <experimental/filesystem>
-#endif
 
 #include "crimson/common/buffer_io.h"
 
-#if defined(__cpp_lib_filesystem)
-namespace fs = std::filesystem;
-#elif defined(__cpp_lib_experimental_filesystem)
-namespace fs = std::experimental::filesystem;
-#endif
-
 namespace crimson::common {
 
 ConfigProxy::ConfigProxy(const EntityName& name, std::string_view cluster)
@@ -88,7 +78,7 @@ seastar::future<> ConfigProxy::parse_config_files(const std::string& conf_files)
 	  return seastar::make_ready_future<seastar::stop_iteration>(
             seastar::stop_iteration::yes);
         });
-      }).handle_exception_type([] (const fs::filesystem_error&) {
+      }).handle_exception_type([] (const std::filesystem::filesystem_error&) {
         return seastar::make_ready_future<seastar::stop_iteration>(
           seastar::stop_iteration::no);
       }).handle_exception_type([] (const std::invalid_argument&) {