summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2019-03-08 13:03:03 -0800
committerPatrick Venture <venture@google.com>2019-03-08 13:03:03 -0800
commit005d46214073bb9ede18b4aa17eac8ff4ea72d7d (patch)
tree549324b2b29a4d60394f33c2dbf0be5247d713a1
parentf42741197ec807e0436a5e519ccff18519c67248 (diff)
downloadphosphor-pid-control-005d46214073bb9ede18b4aa17eac8ff4ea72d7d.tar.gz
phosphor-pid-control-005d46214073bb9ede18b4aa17eac8ff4ea72d7d.zip
use filesystem instead of experimental
Use filesystem now that it should be available instead of experimental::filesystem. Change-Id: I8648ac2b279eea42c13d6b12f312a2e1e02aa152 Signed-off-by: Patrick Venture <venture@google.com>
-rw-r--r--configure.ac5
-rw-r--r--sysfs/util.cpp4
2 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index f77953a..b7f743f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,11 +46,6 @@ PKG_CHECK_MODULES(
[AC_MSG_ERROR([Could not find libipmid...openbmc/phosphor-host-ipmid package required])]
)
AC_CHECK_HEADER(
- experimental/filesystem,
- [],
- [AC_MSG_ERROR([Could not find experimental/filesystem...libstdc++fs development package required])]
-)
-AC_CHECK_HEADER(
nlohmann/json.hpp,
[],
[AC_MSG_ERROR([Could not find nlohmann/json.hpp])]
diff --git a/sysfs/util.cpp b/sysfs/util.cpp
index aeceada..d73ec0f 100644
--- a/sysfs/util.cpp
+++ b/sysfs/util.cpp
@@ -16,7 +16,7 @@
#include "sysfs/util.hpp"
-#include <experimental/filesystem>
+#include <filesystem>
#include <iostream>
#include <string>
@@ -31,7 +31,7 @@
*/
static constexpr auto platform = "/sys/devices/platform/";
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
std::string FixupPath(std::string original)
{
OpenPOWER on IntegriCloud