diff options
author | Vernon Mauery <vernon.mauery@intel.com> | 2018-07-20 10:52:36 -0700 |
---|---|---|
committer | Vernon Mauery <vernon.mauery@linux.intel.com> | 2018-08-08 17:06:54 +0000 |
commit | 185b9f8b9d71e92cd31ee32baa09b5807c4a46e9 (patch) | |
tree | 30a54df77abcd3729f3930c58a02c9f7fa390958 /apphandler.cpp | |
parent | c5046574c66b835173d00b7ed21e2bc008d5ca5f (diff) | |
download | phosphor-host-ipmid-185b9f8b9d71e92cd31ee32baa09b5807c4a46e9.tar.gz phosphor-host-ipmid-185b9f8b9d71e92cd31ee32baa09b5807c4a46e9.zip |
Standardize use of filesystem
If <filesystem> exists, use that, if it doesn't, try
<experimental/filesystem>. Either way, access it from std via a
namespace splice.
Change-Id: I5b35ee9f74b88e188cb3ca3fed9abaec64933697
Signed-off-by: Vernon Mauery <vernon.mauery@intel.com>
Diffstat (limited to 'apphandler.cpp')
-rw-r--r-- | apphandler.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apphandler.cpp b/apphandler.cpp index e69829f..05da67e 100644 --- a/apphandler.cpp +++ b/apphandler.cpp @@ -7,6 +7,17 @@ #include "types.hpp" #include "utils.hpp" +#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; +} +#else +# error filesystem not available +#endif #include <fstream> #include <stdio.h> #include <stdint.h> @@ -16,7 +27,6 @@ #include <vector> #include <string> #include <cstddef> -#include <experimental/filesystem> #include <arpa/inet.h> #include "transporthandler.hpp" @@ -49,7 +59,7 @@ using namespace sdbusplus::xyz::openbmc_project::Common::Error; using Version = sdbusplus::xyz::openbmc_project::Software::server::Version; using Activation = sdbusplus::xyz::openbmc_project::Software::server::Activation; -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; // Offset in get device id command. typedef struct |