Drop boost::filesystem in favor of std::filesystem (#3990)

otland · Mar 7, 2022 · 4b800b2 · 4b800b2
1 parent 1cef0ea
commit 4b800b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,13 +61,12 @@ else ()
  find_package(Lua REQUIRED)
 endif ()
 
-find_package(Boost 1.66.0 REQUIRED COMPONENTS date_time system filesystem iostreams)
+find_package(Boost 1.66.0 REQUIRED COMPONENTS date_time system iostreams)
 
 include_directories(${Boost_INCLUDE_DIRS} ${Crypto++_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${PUGIXML_INCLUDE_DIR})
 target_link_libraries(tfs PRIVATE
  Boost::date_time
  Boost::system
- Boost::filesystem
  Boost::iostreams
  fmt::fmt
  ${CMAKE_THREAD_LIBS_INIT}

diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,6 @@ FROM alpine:3.15.0
 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
  boost-iostreams \
  boost-system \
- boost-filesystem \
  crypto++ \
  fmt \
  gmp \

diff --git a/src/script.cpp b/src/script.cpp
@@ -3,9 +3,10 @@
 
 #include "otpch.h"
 
-#include "script.h"
-#include <boost/filesystem.hpp>
 #include "configmanager.h"
+#include "script.h"
+
+#include <filesystem>
 
 extern LuaEnvironment g_luaEnvironment;
 extern ConfigManager g_config;
@@ -23,7 +24,7 @@ Scripts::~Scripts()
 
 bool Scripts::loadScripts(std::string folderName, bool isLib, bool reload)
 {
- namespace fs = boost::filesystem;
+ namespace fs = std::filesystem;
 
  const auto dir = fs::current_path() / "data" / folderName;
  if (!fs::exists(dir) || !fs::is_directory(dir)) {