diff options
author | Patrick Venture <venture@google.com> | 2018-09-12 13:27:42 -0700 |
---|---|---|
committer | Patrick Venture <venture@google.com> | 2018-09-25 10:07:22 -0700 |
commit | 3a5071a9256ded54366494e161045db73b2d7a92 (patch) | |
tree | 82366dd682adb963c8d49fad55893b0050f51500 /transporthandler.cpp | |
parent | dde78e0301f7e4d2a0c7f63700530bbe96ced51c (diff) | |
download | phosphor-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 'transporthandler.cpp')
-rw-r--r-- | transporthandler.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/transporthandler.cpp b/transporthandler.cpp index 217468d..1222d5a 100644 --- a/transporthandler.cpp +++ b/transporthandler.cpp @@ -1,34 +1,19 @@ #include "transporthandler.hpp" -#include <arpa/inet.h> - -#include <chrono> -#include <fstream> -#include <string> - -#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 "app/channel.hpp" #include "ipmid.hpp" #include "net.hpp" #include "timer.hpp" #include "utils.hpp" +#include <arpa/inet.h> #include <host-ipmid/ipmid-api.h> +#include <chrono> +#include <fstream> #include <phosphor-logging/elog-errors.hpp> #include <phosphor-logging/log.hpp> +#include <string> #include <xyz/openbmc_project/Common/error.hpp> #define SYSTEMD_NETWORKD_DBUS 1 @@ -38,6 +23,19 @@ namespace filesystem = std::experimental::filesystem; #include <systemd/sd-bus.h> #endif +#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 std::unique_ptr<phosphor::ipmi::Timer> networkTimer; const int SIZE_MAC = 18; // xx:xx:xx:xx:xx:xx |