Remove experimental prefix from filesystem includes

library-data-platform · Jan 1, 2024 · ac2903a · ac2903a
1 parent 50cbd17
commit ac2903a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ set(RapidJSON_DIR "${CMAKE_SOURCE_DIR}/cmake")
 
 #add_subdirectory (src)
 
-SET(MACOS_RAPIDJSON_INCLUDE "-I/opt/homebrew//Cellar/rapidjson/1.1.0/include")
+SET(MACOS_RAPIDJSON_INCLUDE "-I/opt/homebrew/Cellar/rapidjson/1.1.0/include")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pedantic -Wall -Wno-deprecated-declarations ${MACOS_RAPIDJSON_INCLUDE}")
 
 IF(CMAKE_COMPILER_IS_GNUCXX)

diff --git a/src/addcolumns.cpp b/src/addcolumns.cpp
@@ -1,14 +1,12 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
 #include <algorithm>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 
 #include "addcolumns.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void get_add_column_filename(const ldp_options& opt, string* filename)
 {

diff --git a/src/dropfields.cpp b/src/dropfields.cpp
@@ -1,14 +1,12 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
 #include <algorithm>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 
 #include "dropfields.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void get_drop_field_filename(const ldp_options& opt, string* filename)
 {

diff --git a/src/init.cpp b/src/init.cpp
@@ -1,6 +1,4 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
-#include <experimental/filesystem>
+#include <filesystem>
 #include <sstream>
 #include <stdexcept>
 
@@ -12,7 +10,7 @@
 #include "schema.h"
 #include "util.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 static int64_t ldp_latest_database_version = 34;
 

diff --git a/src/stage.cpp b/src/stage.cpp
@@ -1,8 +1,6 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
 #include <algorithm>
 #include <cstdio>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <map>
 #include <memory>
 #include <regex>
@@ -22,7 +20,7 @@
 #include "schema.h"
 #include "stage.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 namespace json = rapidjson;
 
 const long unsigned int copy_buffer_size = 12500000;

diff --git a/src/update.cpp b/src/update.cpp
@@ -1,8 +1,6 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
 #include <cstdint>
 #include <curl/curl.h>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <iostream>
 #include <map>
 #include <stdexcept>
@@ -24,7 +22,7 @@
 #include "update.h"
 #include "users.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void make_update_tmp_dir(const ldp_options& opt, string* loaddir)
 {

diff --git a/src/users.cpp b/src/users.cpp
@@ -1,14 +1,12 @@
-#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
-
 #include <algorithm>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <sstream>
 
 #include "users.h"
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void get_users_filename(const ldp_options& opt, string* filename)
 {