diff options
| author | James Feist <james.feist@linux.intel.com> | 2019-04-15 21:09:15 +0300 |
|---|---|---|
| committer | James Feist <james.feist@linux.intel.com> | 2019-04-15 21:09:15 +0300 |
| commit | 4418c7f0ddcc5d3518831729a380a0b67e5d4093 (patch) | |
| tree | cd9136e804fd1c82daf7b74af495b83f05a22e5b /include | |
| parent | 0e7de46f9b6365bad4e79a3933112750c5bf7853 (diff) | |
| download | bmcweb-4418c7f0ddcc5d3518831729a380a0b67e5d4093.tar.xz | |
Remove references to experimental filesystem
We're at CPP17 everywhere now, no need to keep the
experimental refrerence.
Tested: It builds
Change-Id: I5f6571eb411bf055e9715f7d96d1be5a3cb2e119
Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filesystem.hpp | 14 | ||||
| -rw-r--r-- | include/openbmc_dbus_rest.hpp | 3 | ||||
| -rw-r--r-- | include/webassets.hpp | 3 |
3 files changed, 2 insertions, 18 deletions
diff --git a/include/filesystem.hpp b/include/filesystem.hpp deleted file mode 100644 index 9915ee1e17..0000000000 --- a/include/filesystem.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// this file splices filesystem in depending on the implementation - -#if __has_include(<filesystem>) -#include <filesystem> -#elif __has_include(<experimental/filesystem>) -#include <experimental/filesystem> -namespace std -{ -// splice experimental::filesystem into std -namespace filesystem = std::experimental::filesystem; -} // namespace std -#else -#error filesystem not available -#endif diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp index 605d6f9d72..6938079f23 100644 --- a/include/openbmc_dbus_rest.hpp +++ b/include/openbmc_dbus_rest.hpp @@ -13,8 +13,6 @@ // limitations under the License. #pragma once -#include "filesystem.hpp" - #include <crow/app.h> #include <tinyxml2.h> @@ -23,6 +21,7 @@ #include <boost/container/flat_set.hpp> #include <dbus_singleton.hpp> #include <dbus_utility.hpp> +#include <filesystem> #include <fstream> #include <sdbusplus/message/types.hpp> diff --git a/include/webassets.hpp b/include/webassets.hpp index 9bd40dbf8f..daead984fc 100644 --- a/include/webassets.hpp +++ b/include/webassets.hpp @@ -1,7 +1,5 @@ #pragma once -#include "filesystem.hpp" - #include <crow/app.h> #include <crow/http_request.h> #include <crow/http_response.h> @@ -9,6 +7,7 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/container/flat_set.hpp> +#include <filesystem> #include <fstream> #include <string> |