From 48eb4029694c228ee8bb09202efb9d6c8b741d96 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 8 Mar 2019 13:08:42 -0800 Subject: use filesystem instead of experimental Use filesystem now that it should be available instead of experimental::filesystem. Change-Id: Ia9b17f33ced70fe2f1f12f11d8708d15ff422bfa Signed-off-by: Patrick Venture --- configure.ac | 5 ----- fs.cpp | 4 ++-- test/utils_unittest.cpp | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 1e906a8..fb3d62a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,11 +42,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 developement package required])] -) AX_PTHREAD([], [AC_MSG_ERROR(["pthread required and not found"])]) # Make it possible for users to choose if they want test support diff --git a/fs.cpp b/fs.cpp index 0c20d83..244fb8b 100644 --- a/fs.cpp +++ b/fs.cpp @@ -16,13 +16,13 @@ #include "fs.hpp" -#include +#include #include #include namespace blobs { -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; std::vector getLibraryList(const std::string& path, PathMatcher check) diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp index b986bd8..6b89f6a 100644 --- a/test/utils_unittest.cpp +++ b/test/utils_unittest.cpp @@ -4,14 +4,14 @@ #include "manager_mock.hpp" #include "utils.hpp" -#include +#include #include #include #include #include -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; namespace blobs { -- cgit v1.2.3