From bdda8008226db9f4ae6d88b553ffa6192dfcfd57 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernon.mauery@linux.intel.com>
Date: Tue, 26 Feb 2019 10:18:51 -0800
Subject: Remove experimental filesystem splice

In order to be compatible with older versions of GCC that did not have
the experimental filesystem moved over to the standard paths, the code
would splice the experimental code into the std namespace. This is no
longer necessary with yocto 2.6 and the latest versions of GCC.

Change-Id: I2db13c52a91456318795819f2d45c3386b4c56d2
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
---
 sensordatahandler.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'sensordatahandler.cpp')

diff --git a/sensordatahandler.cpp b/sensordatahandler.cpp
index 7903138..1de1540 100644
--- a/sensordatahandler.cpp
+++ b/sensordatahandler.cpp
@@ -3,6 +3,7 @@
 #include "sensorhandler.hpp"
 
 #include <bitset>
+#include <filesystem>
 #include <ipmid/types.hpp>
 #include <ipmid/utils.hpp>
 #include <optional>
@@ -11,19 +12,6 @@
 #include <sdbusplus/message/types.hpp>
 #include <xyz/openbmc_project/Common/error.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;
-} // namespace std
-#else
-#error filesystem not available
-#endif
-
 namespace ipmi
 {
 namespace sensor
-- 
cgit v1.2.1