Fix IBM management console to match coding standard
Lots of missing inline definitions, a case where a RVO move is not
guaranteed when returning a variant, and removing the header checks,
which means that these types of build errors wont happen in the future.
Tested:
Should be no impact, but could someone from the IBM team grab these
changes and sanity check them?
Signed-off-by: Ed Tanous <ed@tanous.net>
Change-Id: Iea0a06b8e744542a7d08e38217718e7a969f2827
diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index 922ac47..0694b19 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -4,16 +4,12 @@
#include <boost/asio/io_context.hpp>
#include <dbus_monitor.hpp>
#include <dbus_singleton.hpp>
+#include <ibm/management_console_rest.hpp>
#include <image_upload.hpp>
#include <kvm_websocket.hpp>
#include <login_routes.hpp>
#include <obmc_console.hpp>
#include <openbmc_dbus_rest.hpp>
-
-#include <memory>
-#ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE
-#include <ibm/management_console_rest.hpp>
-#endif
#include <redfish.hpp>
#include <redfish_v1.hpp>
#include <sdbusplus/asio/connection.hpp>
@@ -24,6 +20,7 @@
#include <vm_websocket.hpp>
#include <webassets.hpp>
+#include <memory>
#include <string>
#ifdef BMCWEB_ENABLE_VM_NBDPROXY