From 185b9f8b9d71e92cd31ee32baa09b5807c4a46e9 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernon.mauery@intel.com>
Date: Fri, 20 Jul 2018 10:52:36 -0700
Subject: 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>
---
 chassishandler.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'chassishandler.cpp')

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;
-- 
cgit v1.2.1