fixes include order problems.

bakerstu · Sep 1, 2020 · 6eb5206 · 6eb5206
1 parent 02aea79
commit 6eb5206
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/applications/hub/main.cxx b/applications/hub/main.cxx
@@ -39,15 +39,15 @@
 
 #include <memory>
 
+#include "executor/Executor.hxx"
+#include "executor/Service.hxx"
 #include "os/os.h"
-#include "utils/constants.hxx"
+#include "utils/ClientConnection.hxx"
+#include "utils/GcTcpHub.hxx"
 #include "utils/Hub.hxx"
 #include "utils/HubDeviceSelect.hxx"
 #include "utils/SocketCan.hxx"
-#include "utils/GcTcpHub.hxx"
-#include "utils/ClientConnection.hxx"
-#include "executor/Executor.hxx"
-#include "executor/Service.hxx"
+#include "utils/constants.hxx"
 
 Executor<1> g_executor("g_executor", 0, 1024);
 Service g_service(&g_executor);

diff --git a/src/openlcb/SimpleStack.cxx b/src/openlcb/SimpleStack.cxx
@@ -48,10 +48,10 @@
 
 #include "openlcb/SimpleStack.hxx"
 
-#include "openmrn_features.h"
 #include "openlcb/EventHandler.hxx"
 #include "openlcb/NodeInitializeFlow.hxx"
 #include "openlcb/SimpleNodeInfo.hxx"
+#include "openmrn_features.h"
 #include "utils/HubDeviceSelect.hxx"
 #include "utils/SocketCan.hxx"
 

diff --git a/src/utils/ClientConnection.hxx b/src/utils/ClientConnection.hxx
@@ -35,11 +35,13 @@
 #ifndef _UTILS_CLIENTCONNECTION_HXX_
 #define _UTILS_CLIENTCONNECTION_HXX_
 
-#include "utils/GridConnectHub.hxx"
 #include <stdio.h>
 #include <termios.h> /* tc* functions */
 #include <unistd.h>
 
+#include "utils/GridConnectHub.hxx"
+#include "utils/socket_listener.hxx"
+
 /// Abstract base class for the Hub's connections.
 class ConnectionClient
 {