Optimize includes for faster compilation

BearWare · Oct 26, 2023 · 475b112 · 475b112
1 parent 89be726
commit 475b112
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 35 deletions.
diff --git a/Library/TeamTalkLib/teamtalk/Channel.h b/Library/TeamTalkLib/teamtalk/Channel.h
@@ -24,12 +24,13 @@
 #if !defined(CHANNEL_H)
 #define CHANNEL_H
 
-#include <ace/SString.h>
-
-#include <myace/MyACE.h>
-#include "ttassert.h"
 #include "Common.h"
 #include "PacketLayout.h"
+#include "ttassert.h"
+
+#include <myace/MyACE.h>
+
+#include <ace/SString.h>
 
 #include <map>
 #include <vector>

diff --git a/Library/TeamTalkLib/teamtalk/CodecCommon.cpp b/Library/TeamTalkLib/teamtalk/CodecCommon.cpp
@@ -22,6 +22,8 @@
  */
 
 #include "CodecCommon.h"
+#include "PacketLayout.h"
+
 #include <myace/MyACE.h>
 
 #define SPEEX_NB_MODE 0

diff --git a/Library/TeamTalkLib/teamtalk/Commands.h b/Library/TeamTalkLib/teamtalk/Commands.h
@@ -24,13 +24,14 @@
 #if !defined(COMMANDS_H)
 #define COMMANDS_H
 
-#include <vector>
-#include <set>
-#include <map>
+#include "Common.h"
 
 #include <ace/ACE.h>
 #include <ace/SString.h>
-#include "Common.h"
+
+#include <vector>
+#include <set>
+#include <map>
 
 #define TEAMTALK_PROTOCOL_VERSION ACE_TEXT("5.13")
 

diff --git a/Library/TeamTalkLib/teamtalk/Common.h b/Library/TeamTalkLib/teamtalk/Common.h
@@ -24,7 +24,6 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include "PacketLayout.h"
 #include <TeamTalkDefs.h>
 #include <codec/MediaUtil.h>
 

diff --git a/Library/TeamTalkLib/teamtalk/DesktopSession.h b/Library/TeamTalkLib/teamtalk/DesktopSession.h
@@ -25,7 +25,6 @@
 #define DESKTOPSESSION_H
 
 #include "Common.h"
-#include "PacketLayout.h"
 #include <vector>
 
 #define RGB8_BLOCK_PIXEL_W 120

diff --git a/Library/TeamTalkLib/teamtalk/PacketLayout.cpp b/Library/TeamTalkLib/teamtalk/PacketLayout.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "PacketLayout.h"
+#include "Common.h"
 
 using namespace std;
 

diff --git a/Library/TeamTalkLib/teamtalk/PacketLayout.h b/Library/TeamTalkLib/teamtalk/PacketLayout.h
@@ -24,10 +24,8 @@
 #if !defined(PACKETLAYOUT_H)
 #define PACKETLAYOUT_H
 
-#include "Common.h"
 #include <myace/MyACE.h>
 
-#include <ace/ACE.h>
 #include <vector>
 #include <memory>
 #include <map>

diff --git a/Library/TeamTalkLib/teamtalk/User.h b/Library/TeamTalkLib/teamtalk/User.h
@@ -24,12 +24,13 @@
 #if !defined(USER_H)
 #define USER_H
 
-#include <map>
+#include "Common.h"
+#include "PacketLayout.h"
 
 #include <ace/SString.h>
 #include <ace/INET_Addr.h>
 
-#include "PacketLayout.h"
+#include <map>
 
 namespace teamtalk {
 

diff --git a/Library/TeamTalkLib/teamtalk/client/AudioThread.cpp b/Library/TeamTalkLib/teamtalk/client/AudioThread.cpp
@@ -23,10 +23,11 @@
 
 #include "AudioThread.h"
 
-#include <myace/MyACE.h>
 #include <teamtalk/ttassert.h>
 #include <teamtalk/CodecCommon.h>
+#include <teamtalk/PacketLayout.h>
 #include <codec/MediaUtil.h>
+#include <myace/MyACE.h>
 
 using namespace std;
 using namespace teamtalk;

diff --git a/Library/TeamTalkLib/teamtalk/client/DesktopShare.h b/Library/TeamTalkLib/teamtalk/client/DesktopShare.h
@@ -24,18 +24,18 @@
 #ifndef DESKTOPSHARE_H
 #define DESKTOPSHARE_H
 
-#include <map>
-#include <vector>
-#include <set>
-#include <memory>
+#include <teamtalk/PacketLayout.h>
+#include <teamtalk/PacketHelper.h>
+#include <teamtalk/DesktopSession.h>
 
 #include <ace/Task.h>
 #include <ace/Reactor.h>
 #include <ace/Semaphore.h>
 
-#include <teamtalk/PacketLayout.h>
-#include <teamtalk/PacketHelper.h>
-#include <teamtalk/DesktopSession.h>
+#include <map>
+#include <vector>
+#include <set>
+#include <memory>
 
 namespace teamtalk {
 

diff --git a/Library/TeamTalkLib/teamtalk/client/VideoThread.h b/Library/TeamTalkLib/teamtalk/client/VideoThread.h
@@ -24,16 +24,16 @@
 #ifndef VIDEOTHREAD_H
 #define VIDEOTHREAD_H
 
-#include <ace/Task.h>
-#include <ace/Message_Block.h>
-
 #if defined(ENABLE_VPX)
 #include <codec/VpxEncoder.h>
 #endif
 
 #include <teamtalk/Common.h>
 #include <codec/MediaUtil.h>
 
+#include <ace/Task.h>
+#include <ace/Message_Block.h>
+
 #include <memory>
 
 //Get VideoFrame from ACE_Message_Block

diff --git a/Library/TeamTalkLib/teamtalk/server/AcceptHandler.h b/Library/TeamTalkLib/teamtalk/server/AcceptHandler.h
@@ -24,12 +24,12 @@
 #if !defined(ACCEPTHANDLER_H)
 #define ACCEPTHANDLER_H
 
+#include <teamtalk/StreamHandler.h>
+
 #include <ace/Acceptor.h>
 #include <ace/SOCK_Stream.h>
 #include <ace/SOCK_Acceptor.h>
 
-#include <teamtalk/StreamHandler.h>
-
 #if defined(ENABLE_ENCRYPTION)
 #include <ace/SSL/SSL_SOCK_Stream.h>
 #include <ace/SSL/SSL_SOCK_Acceptor.h>

diff --git a/Library/TeamTalkLib/teamtalk/server/ServerNode.h b/Library/TeamTalkLib/teamtalk/server/ServerNode.h
@@ -24,22 +24,21 @@
 #if !defined(SERVERNODE_H)
 #define SERVERNODE_H
 
+#include "AcceptHandler.h"
+#include "ServerChannel.h"
+#include "ServerUser.h"
 #include "Server.h"
 
-// ACE
-#include <ace/Recursive_Thread_Mutex.h>
-#include <ace/Guard_T.h>
-#include <ace/Acceptor.h>
-
 #include <teamtalk/Commands.h>
 #include <teamtalk/PacketHandler.h>
 
 #include <myace/TimerHandler.h>
 #include <myace/MyACE.h>
 
-#include "AcceptHandler.h"
-#include "ServerChannel.h"
-#include "ServerUser.h"
+// ACE
+#include <ace/Recursive_Thread_Mutex.h>
+#include <ace/Guard_T.h>
+#include <ace/Acceptor.h>
 
 // STL
 #include <map>
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ @@
      */
     #include "PacketLayout.h"
+    #include "Common.h"
     using namespace std;
@@ Expand Down @@