summaryrefslogtreecommitdiffstats
path: root/apphandler.cpp
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2018-09-12 13:27:42 -0700
committerPatrick Venture <venture@google.com>2018-09-25 10:07:22 -0700
commit3a5071a9256ded54366494e161045db73b2d7a92 (patch)
tree82366dd682adb963c8d49fad55893b0050f51500 /apphandler.cpp
parentdde78e0301f7e4d2a0c7f63700530bbe96ced51c (diff)
downloadphosphor-host-ipmid-3a5071a9256ded54366494e161045db73b2d7a92.tar.gz
phosphor-host-ipmid-3a5071a9256ded54366494e161045db73b2d7a92.zip
move filesystem inclusion to bottom of list
Change-Id: I4aa3c984992236bb5b4a5c62c3d42a33c12d55de Signed-off-by: Patrick Venture <venture@google.com>
Diffstat (limited to 'apphandler.cpp')
-rw-r--r--apphandler.cpp29
1 files changed, 14 insertions, 15 deletions
diff --git a/apphandler.cpp b/apphandler.cpp
index f3a1164..ab5c604 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -15,26 +15,12 @@
#include <systemd/sd-bus.h>
#include <unistd.h>
-#include <nlohmann/json.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
-
#include <algorithm>
#include <array>
#include <cstddef>
#include <fstream>
#include <memory>
+#include <nlohmann/json.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/log.hpp>
#include <string>
@@ -45,6 +31,19 @@ namespace filesystem = std::experimental::filesystem;
#include <xyz/openbmc_project/Software/Version/server.hpp>
#include <xyz/openbmc_project/State/BMC/server.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 sd_bus* bus;
constexpr auto bmc_state_interface = "xyz.openbmc_project.State.BMC";
OpenPOWER on IntegriCloud