filesystem: use non-experimental
std::filesystem has replaced std::experimental::filesystem
since at least C++17 and experimental no longer links without
extra effort in C++20. Use the C++17 std::filesystem APIs.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I33cfc22e04e435fcdca5bf83b5877a7a27c394c8
diff --git a/elog_serialize.hpp b/elog_serialize.hpp
index eaa47d4..9a2d984 100644
--- a/elog_serialize.hpp
+++ b/elog_serialize.hpp
@@ -4,7 +4,7 @@
#include "elog_entry.hpp"
-#include <experimental/filesystem>
+#include <filesystem>
#include <string>
#include <vector>
@@ -13,7 +13,7 @@
namespace logging
{
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
/** @brief Serialize and persist error d-bus object
* @param[in] a - const reference to error entry.
diff --git a/log_manager_main.cpp b/log_manager_main.cpp
index 7302abd..6371440 100644
--- a/log_manager_main.cpp
+++ b/log_manager_main.cpp
@@ -3,7 +3,7 @@
#include "extensions.hpp"
#include "log_manager.hpp"
-#include <experimental/filesystem>
+#include <filesystem>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/server/manager.hpp>
#include <sdeventplus/event.hpp>
@@ -22,7 +22,7 @@
phosphor::logging::Manager mgr(bus, OBJ_LOGGING, iMgr);
// Create a directory to persist errors.
- std::experimental::filesystem::create_directories(ERRLOG_PERSIST_PATH);
+ std::filesystem::create_directories(ERRLOG_PERSIST_PATH);
// Recreate error d-bus objects from persisted errors.
iMgr.restore();
diff --git a/test/elog_errorwrap_test.hpp b/test/elog_errorwrap_test.hpp
index 154dee5..812b3cf 100644
--- a/test/elog_errorwrap_test.hpp
+++ b/test/elog_errorwrap_test.hpp
@@ -4,7 +4,7 @@
#include "log_manager.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
-#include <experimental/filesystem>
+#include <filesystem>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/elog.hpp>
#include <phosphor-logging/log.hpp>
@@ -20,7 +20,7 @@
namespace internal
{
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
class journalInterface
{
diff --git a/test/remote_logging_tests.hpp b/test/remote_logging_tests.hpp
index 936e3bb..d56a539 100644
--- a/test/remote_logging_tests.hpp
+++ b/test/remote_logging_tests.hpp
@@ -2,7 +2,7 @@
#include "phosphor-rsyslog-config/server-conf.hpp"
-#include <experimental/filesystem>
+#include <filesystem>
#include <sdbusplus/bus.hpp>
#include "gmock/gmock.h"
@@ -15,7 +15,7 @@
namespace test
{
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
char tmplt[] = "/tmp/logging_test.XXXXXX";
auto bus = sdbusplus::bus::new_default();
diff --git a/test/serialization_tests.hpp b/test/serialization_tests.hpp
index 7831ce2..902ddf3 100644
--- a/test/serialization_tests.hpp
+++ b/test/serialization_tests.hpp
@@ -4,7 +4,7 @@
#include <stdlib.h>
-#include <experimental/filesystem>
+#include <filesystem>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/test/sdbus_mock.hpp>
@@ -17,7 +17,7 @@
namespace test
{
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
char tmplt[] = "/tmp/logging_test.XXXXXX";
sdbusplus::SdBusMock sdbusMock;