c++17: drop experimental::filesystem
Use the real filesystem library, and drop support for building with
experimental under c++14.
Change-Id: I47cbfc30b223db9dc28e9536ceb84e9fe3342e96
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/ubi/activation_ubi.cpp b/ubi/activation_ubi.cpp
index 97358e8..946a741 100644
--- a/ubi/activation_ubi.cpp
+++ b/ubi/activation_ubi.cpp
@@ -5,7 +5,7 @@
#include <phosphor-logging/log.hpp>
-#include <experimental/filesystem>
+#include <filesystem>
namespace openpower
{
@@ -13,7 +13,6 @@
{
namespace updater
{
-namespace fs = std::experimental::filesystem;
namespace softwareServer = sdbusplus::xyz::openbmc_project::Software::server;
using namespace phosphor::logging;
@@ -63,9 +62,9 @@
// verify that this happened, we check for the mount dirs PNOR_PRSV
// and PNOR_RW_PREFIX_<versionid>, as well as the image dir R0.
- if ((fs::is_directory(PNOR_PRSV)) &&
- (fs::is_directory(PNOR_RW_PREFIX + versionId)) &&
- (fs::is_directory(PNOR_RO_PREFIX + versionId)))
+ if ((std::filesystem::is_directory(PNOR_PRSV)) &&
+ (std::filesystem::is_directory(PNOR_RW_PREFIX + versionId)) &&
+ (std::filesystem::is_directory(PNOR_RO_PREFIX + versionId)))
{
finishActivation();
if (Activation::checkApplyTimeImmediate())