shrink blocks of #if __has_include(<filesystem>) in fbcode

Summary: In a semi-automatic way shrinked all blocks and manually corrected those few moving around. Reviewed By: anps77 Differential Revision: D53143734 fbshipit-source-id: e50b273583fbb4a9e13752f3e1fa477eb24af414
facebook · Jan 29, 2024 · 0336c1c · 0336c1c
1 parent 1776bed
commit 0336c1c
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 25 deletions.
diff --git a/openr/Main.cpp b/openr/Main.cpp
@@ -5,13 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#if __has_include("filesystem")
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <syslog.h>
 #include <fstream>
 #include <stdexcept>

diff --git a/openr/common/Util.cpp b/openr/common/Util.cpp
@@ -5,13 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#if __has_include("filesystem")
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 #include <fb303/ServiceData.h>
 #include <folly/logging/xlog.h>

diff --git a/openr/config-store/PersistentStore.h b/openr/config-store/PersistentStore.h
@@ -8,13 +8,8 @@
 #pragma once
 
 #include <chrono>
-#if __has_include("filesystem")
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <string>
 
 #include <folly/futures/Future.h>

diff --git a/openr/config/Config.h b/openr/config/Config.h
@@ -7,13 +7,8 @@
 
 #pragma once
 
-#if __has_include("filesystem")
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 #include <folly/IPAddress.h>
 #include <folly/io/async/SSLContext.h>
 #include <openr/common/FileUtil.h>

diff --git a/openr/ctrl-server/OpenrCtrlHandler.cpp b/openr/ctrl-server/OpenrCtrlHandler.cpp
@@ -8,13 +8,8 @@
 #include <openr/ctrl-server/OpenrCtrlHandler.h>
 #include <re2/re2.h>
 
-#if __has_include("filesystem")
 #include <filesystem>
 namespace fs = std::filesystem;
-#else
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
-#endif
 
 #include <folly/ExceptionString.h>
 #include <folly/logging/xlog.h>