commit 9c7897ce9176bf954e7e6b9a50d07c71e4035242
author Brandon Wyman <bjwyman@gmail.com> Thu Mar 28 17:42:34 2019 -0500
committer Matt Spinler <spinler@us.ibm.com> Wed Apr 10 21:26:54 2019 +0000
tree f074c2c5b5fade340863136bf475731965ea2617
parent 05be4a92c287d957fb7bd3f67b1b722276c12b16

Cleanup: Use filesystem instead of experimental

The GCC version bump in Yocto 2.6 allows for use of std::filesystem
instead of std::experimental::filesystem.

Change-Id: Ibfd6c285bcbd6695e5cd4e3090ffa214fc861499
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>

pmbus.cpp

diff --git a/pmbus.cpp b/pmbus.cpp
index 9d991a6..f755e99 100644
--- a/pmbus.cpp
+++ b/pmbus.cpp
@@ -15,7 +15,7 @@
  */
 #include "pmbus.hpp"
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
@@ -30,7 +30,7 @@
 using namespace phosphor::logging;
 using namespace sdbusplus::xyz::openbmc_project::Common::Error;
 using namespace sdbusplus::xyz::openbmc_project::Common::Device::Error;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 /**
  * @brief Helper to close a file handle

pmbus.hpp

diff --git a/pmbus.hpp b/pmbus.hpp
index 22452cf..cb244fd 100644
--- a/pmbus.hpp
+++ b/pmbus.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <string>
 #include <vector>
 
@@ -9,7 +9,7 @@
 namespace pmbus
 {
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 // The file name Linux uses to capture the STATUS_WORD from pmbus.
 constexpr auto STATUS_WORD = "status0";

power-sequencer/ucd90160.cpp

diff --git a/power-sequencer/ucd90160.cpp b/power-sequencer/ucd90160.cpp
index 08b8a7d..203004d 100644
--- a/power-sequencer/ucd90160.cpp
+++ b/power-sequencer/ucd90160.cpp
@@ -41,7 +41,7 @@
 
 constexpr auto INVENTORY_OBJ_PATH = "/xyz/openbmc_project/inventory";
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 using namespace gpio;
 using namespace pmbus;
 using namespace phosphor::logging;

power-sequencer/ucd90160.hpp

diff --git a/power-sequencer/ucd90160.hpp b/power-sequencer/ucd90160.hpp
index 6213c26..5eedda8 100644
--- a/power-sequencer/ucd90160.hpp
+++ b/power-sequencer/ucd90160.hpp
@@ -6,7 +6,7 @@
 #include "types.hpp"
 
 #include <algorithm>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <map>
 #include <sdbusplus/bus.hpp>
 #include <vector>
@@ -88,8 +88,8 @@
      * @return fs::path - The gpiochip path, like
      *                   /dev/gpiochip1
      */
-    static std::experimental::filesystem::path
-        findGPIODevice(const std::experimental::filesystem::path& path);
+    static std::filesystem::path
+        findGPIODevice(const std::filesystem::path& path);
 
     /**
      * Checks for VOUT faults on the device.
@@ -289,7 +289,7 @@
      * The path to the GPIO device used to read
      * the GPI (PGOOD) status
      */
-    std::experimental::filesystem::path gpioDevice;
+    std::filesystem::path gpioDevice;
 
     /**
      * The D-Bus bus object