summaryrefslogtreecommitdiffstats
path: root/selutility.cpp
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2019-02-26 10:18:51 -0800
committerVernon Mauery <vernon.mauery@linux.intel.com>2019-03-28 15:21:12 +0000
commitbdda8008226db9f4ae6d88b553ffa6192dfcfd57 (patch)
tree089ef09d801e48a3325fe02afbac450c57acdb67 /selutility.cpp
parent90b00c71067df78597db92bb60dbacf654a6f80a (diff)
downloadphosphor-host-ipmid-bdda8008226db9f4ae6d88b553ffa6192dfcfd57.zip
phosphor-host-ipmid-bdda8008226db9f4ae6d88b553ffa6192dfcfd57.tar.gz
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>
Diffstat (limited to 'selutility.cpp')
-rw-r--r--selutility.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/selutility.cpp b/selutility.cpp
index 9edc1b8..3aecb1c 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -5,25 +5,13 @@
#include <ipmid/api.h>
#include <chrono>
+#include <filesystem>
#include <ipmid/types.hpp>
#include <ipmid/utils.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <vector>
#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
-
extern const ipmi::sensor::InvObjectIDMap invSensors;
using namespace phosphor::logging;
using InternalFailure =
OpenPOWER on IntegriCloud