summaryrefslogtreecommitdiffstats
path: root/chassishandler.cpp
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@intel.com>2018-07-20 10:52:36 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2018-08-08 17:06:54 +0000
commit185b9f8b9d71e92cd31ee32baa09b5807c4a46e9 (patch)
tree30a54df77abcd3729f3930c58a02c9f7fa390958 /chassishandler.cpp
parentc5046574c66b835173d00b7ed21e2bc008d5ca5f (diff)
downloadphosphor-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 'chassishandler.cpp')
-rw-r--r--chassishandler.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/chassishandler.cpp b/chassishandler.cpp
index 3092e7c..04bbffe 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -19,7 +19,17 @@
#include <fstream>
#include <future>
#include <chrono>
+#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 <string>
#include <map>
@@ -122,7 +132,7 @@ struct GetPOHCountResponse
// Phosphor Host State manager
namespace State = sdbusplus::xyz::openbmc_project::State::server;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
using namespace phosphor::logging;
using namespace sdbusplus::xyz::openbmc_project::Common::Error;
OpenPOWER on IntegriCloud