From 756a3512ce74b93953ced1d99e063b496f9a920b Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 7 Jun 2021 16:31:11 +0800
Subject: [PATCH] *: always include <filesystem>

since there is no need to be compatible with GCC older than GCC-8, so
there is no need to use <experimental/filesystem> as an alternative of
<filesystem> anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/common/ConfUtils.cc                            | 13 +++----------
 src/common/config.cc                               | 11 ++++-------
 src/global/global_init.cc                          |  9 ++-------
 src/kv/MemDB.cc                                    | 10 +++-------
 src/kv/RocksDBStore.cc                             | 14 +++++---------
 src/librbd/cache/pwl/DiscardRequest.cc             | 12 ++++--------
 src/mgr/PyModuleRegistry.cc                        | 10 ++--------
 src/test/admin_socket_output.h                     |  8 ++------
 src/test/common/test_util.cc                       | 10 +++-------
 src/test/confutils.cc                              | 14 +++++---------
 .../immutable_object_cache/test_object_store.cc    | 10 +++-------
 src/test/librbd/migration/test_mock_FileStream.cc  |  6 +-----
 src/tools/ceph-dencoder/ceph_dencoder.cc           |  8 ++------
 .../immutable_object_cache/ObjectCacheStore.cc     |  7 +------
 src/tools/rbd_nbd/rbd-nbd.cc                       |  8 ++------
 15 files changed, 42 insertions(+), 108 deletions(-)

diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc
index d1ed75cea519..ad791ece4f7b 100644
--- a/src/common/ConfUtils.cc
+++ b/src/common/ConfUtils.cc
@@ -16,22 +16,13 @@
 #include <algorithm>
 #include <cctype>
 #include <experimental/iterator>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <iterator>
 #include <map>
 #include <sstream>
 
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#else
-#error std::filesystem not available!
-#endif
-
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
 #include <boost/spirit/include/qi.hpp>
@@ -43,6 +34,8 @@ namespace fs = std::experimental::filesystem;
 #include "common/utf8.h"
 #include "common/ConfUtils.h"
 
+namespace fs = std::filesystem;
+
 using std::ostringstream;
 using std::string;
 
diff --git a/src/common/config.cc b/src/common/config.cc
index 542160a5ac08..855a284b719d 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -12,14 +12,9 @@
  *
  */
 
-#include <boost/type_traits.hpp>
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
+#include <boost/type_traits.hpp>
+
 #include "common/ceph_argparse.h"
 #include "common/common_init.h"
 #include "common/config.h"
@@ -43,6 +38,8 @@ namespace fs = std::experimental::filesystem;
 // set set_mon_vals()
 #define dout_subsys ceph_subsys_monc
 
+namespace fs = std::filesystem;
+
 using std::cerr;
 using std::cout;
 using std::map;
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 32e36d45fe79..f5902f7f8388 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -12,14 +12,7 @@
  *
  */
 
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
 #include "common/async/context_pool.h"
 #include "common/ceph_argparse.h"
 #include "common/code_environment.h"
@@ -50,6 +43,8 @@ namespace fs = std::experimental::filesystem;
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_
 
+namespace fs = std::filesystem;
+
 using std::cerr;
 using std::string;
 
diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc
index 465aab9e999c..f69bf1e4f2fb 100644
--- a/src/kv/MemDB.cc
+++ b/src/kv/MemDB.cc
@@ -6,17 +6,11 @@
  */
 
 #include "include/compat.h"
+#include <filesystem>
 #include <set>
 #include <map>
 #include <string>
 #include <memory>
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -44,6 +38,8 @@ namespace fs = std::experimental::filesystem;
 #define dwarn dout(0)
 #define dinfo dout(0)
 
+namespace fs = std::filesystem;
+
 using std::cerr;
 using std::ostream;
 using std::string;
diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index b7fa258638f4..05ad8844cb01 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -1,17 +1,11 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <set>
+#include <filesystem>
 #include <map>
-#include <string>
 #include <memory>
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
+#include <set>
+#include <string>
 #include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -43,6 +37,8 @@ namespace fs = std::experimental::filesystem;
 #undef dout_prefix
 #define dout_prefix *_dout << "rocksdb: "
 
+namespace fs = std::filesystem;
+
 using std::function;
 using std::list;
 using std::map;
diff --git a/src/librbd/cache/pwl/DiscardRequest.cc b/src/librbd/cache/pwl/DiscardRequest.cc
index 9f66e077b1f1..decefafb5277 100644
--- a/src/librbd/cache/pwl/DiscardRequest.cc
+++ b/src/librbd/cache/pwl/DiscardRequest.cc
@@ -1,20 +1,14 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <filesystem>
+
 #include "common/dout.h"
 #include "common/errno.h"
 #include "common/hostname.h"
 #include "librbd/asio/ContextWQ.h"
 #include "librbd/cache/pwl/DiscardRequest.h"
 
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
 #include "librbd/cache/pwl/ImageCacheState.h"
 
 #include "librbd/cache/Types.h"
@@ -28,6 +22,8 @@ namespace fs = std::experimental::filesystem;
 #define dout_prefix *_dout << "librbd::cache::pwl:DiscardRequest: " \
                            << this << " " << __func__ << ": "
 
+namespace fs = std::filesystem;
+
 namespace librbd {
 namespace cache {
 namespace pwl {
diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc
index 79c42653620d..f5f5008023fc 100644
--- a/src/mgr/PyModuleRegistry.cc
+++ b/src/mgr/PyModuleRegistry.cc
@@ -13,15 +13,7 @@
 
 #include "PyModuleRegistry.h"
 
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#else
-#error std::filesystem not available!
-#endif
 
 #include "include/stringify.h"
 #include "common/errno.h"
@@ -42,6 +34,8 @@ namespace fs = std::experimental::filesystem;
 #undef dout_prefix
 #define dout_prefix *_dout << "mgr[py] "
 
+namespace fs = std::filesystem;
+
 std::set<std::string> obsolete_modules = {
   "orchestrator_cli",
 };
diff --git a/src/test/admin_socket_output.h b/src/test/admin_socket_output.h
index b09f05167c4f..1df12e4a9a5d 100644
--- a/src/test/admin_socket_output.h
+++ b/src/test/admin_socket_output.h
@@ -15,17 +15,13 @@
 #ifndef CEPH_ADMIN_SOCKET_OUTPUT_H
 #define CEPH_ADMIN_SOCKET_OUTPUT_H
 
+#include <filesystem>
 #include <string>
 #include <map>
 #include <set>
 #include <vector>
-#if __has_include(<filesystem>)	 // For extension
-#include <filesystem>
+
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 using socket_results = std::map<std::string, std::string>;
 using test_functions =
diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
index 6249d387656d..cfef2dbad76f 100644
--- a/src/test/common/test_util.cc
+++ b/src/test/common/test_util.cc
@@ -12,17 +12,13 @@
  *
  */
 
+#include <filesystem>
+
+#include "gtest/gtest.h"
 #include "common/ceph_context.h"
 #include "include/util.h"
-#include "gtest/gtest.h"
 
-#if __has_include(<filesystem>)
-#include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 #if defined(__linux__)
 TEST(util, collect_sys_info)
diff --git a/src/test/confutils.cc b/src/test/confutils.cc
index a46d347d9b10..984c3480bd63 100644
--- a/src/test/confutils.cc
+++ b/src/test/confutils.cc
@@ -17,22 +17,18 @@
 #include "gtest/gtest.h"
 #include "include/buffer.h"
 
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
-
 #include <errno.h>
+#include <filesystem>
 #include <iostream>
-#include <stdlib.h>
 #include <sstream>
+
+#include <stdlib.h>
 #include <stdint.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+namespace fs = std::filesystem;
+
 using ceph::bufferlist;
 using std::cerr;
 using std::ostringstream;
diff --git a/src/test/immutable_object_cache/test_object_store.cc b/src/test/immutable_object_cache/test_object_store.cc
index e100ed444568..f4d75274e1a3 100644
--- a/src/test/immutable_object_cache/test_object_store.cc
+++ b/src/test/immutable_object_cache/test_object_store.cc
@@ -1,16 +1,10 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <filesystem>
 #include <iostream>
 #include <unistd.h>
 
-#if __has_include(<filesystem>)
-#include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 #include "gtest/gtest.h"
 #include "include/Context.h"
@@ -24,6 +18,8 @@ namespace fs = std::experimental::filesystem;
 
 #include "tools/immutable_object_cache/ObjectCacheStore.h"
 
+namespace fs = std::filesystem;
+
 using namespace ceph::immutable_obj_cache;
 
 std::string test_cache_path("/tmp/test_ceph_immutable_shared_cache");
diff --git a/src/test/librbd/migration/test_mock_FileStream.cc b/src/test/librbd/migration/test_mock_FileStream.cc
index 3688b56dd556..a5bdfebe4b80 100644
--- a/src/test/librbd/migration/test_mock_FileStream.cc
+++ b/src/test/librbd/migration/test_mock_FileStream.cc
@@ -9,13 +9,9 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 #include "json_spirit/json_spirit.h"
-#if __has_include(<filesystem>)
 #include <filesystem>
+
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 namespace librbd {
 namespace {
diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc
index effcfa41ee95..31c4497d57ac 100644
--- a/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -16,13 +16,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <iomanip>
 
 #include "ceph_ver.h"
@@ -34,6 +28,8 @@ namespace fs = std::experimental::filesystem;
 
 #define MB(m) ((m) * 1024 * 1024)
 
+namespace fs = std::filesystem;
+
 void usage(ostream &out)
 {
   out << "usage: ceph-dencoder [commands ...]" << std::endl;
diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc
index 483687ffe5fc..bbd3fadff7cd 100644
--- a/src/tools/immutable_object_cache/ObjectCacheStore.cc
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc
@@ -3,13 +3,7 @@
 
 #include "ObjectCacheStore.h"
 #include "Utils.h"
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_immutable_obj_cache
@@ -17,6 +11,7 @@ namespace fs = std::experimental::filesystem;
 #define dout_prefix *_dout << "ceph::cache::ObjectCacheStore: " << this << " " \
                            << __func__ << ": "
 
+namespace fs = std::filesystem;
 
 namespace ceph {
 namespace immutable_obj_cache {
diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 6187dbebaa46..d078376e9172 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -44,13 +44,7 @@
 #include <libnl3/netlink/genl/ctrl.h>
 #include <libnl3/netlink/genl/mngt.h>
 
-#if __has_include(<filesystem>)
 #include <filesystem>
-namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -86,6 +80,8 @@ namespace fs = std::experimental::filesystem;
 #undef dout_prefix
 #define dout_prefix *_dout << "rbd-nbd: "
 
+namespace fs = std::filesystem;
+
 using boost::endian::big_to_native;
 using boost::endian::native_to_big;
 
-- 
2.47.3