Merge remote-tracking branch 'origin/1.4.10' into 1.4.10

CMakeLists.txt

@@ -121,6 +121,13 @@ set(SOURCE_FILES
         src/protocol/buffers_allocator_c.cpp
         src/protocol/CryptHandler.cpp
         src/protocol/CompressionHandler.cpp
+        src/protocol/ringbuffer.cpp
+        src/protocol/AcknowledgeManager.cpp
+        src/protocol/PacketLossCalculator.cpp
+        src/protocol/RawCommand.cpp
+        src/protocol/PacketDecoder.cpp
+        src/protocol/PingHandler.cpp
+        src/protocol/PacketStatistics.cpp
 
         src/Properties.cpp
         src/Error.cpp
@@ -134,13 +141,6 @@ set(SOURCE_FILES
         src/bbcode/bbcodes.cpp
 
         src/channel/TreeView.cpp
-        src/protocol/ringbuffer.cpp
-        src/protocol/AcknowledgeManager.cpp
-        src/protocol/PacketLossCalculator.cpp
-        src/protocol/RawCommand.cpp
-        src/protocol/PacketDecoder.cpp
-        src/protocol/PingHandler.cpp
-        src/protocol/PacketStatistics.cpp
 )
 
 set(HEADER_FILES
@@ -189,6 +189,7 @@ endif()
 if(FEATURE_LOGGING)
     set(SOURCE_FILES ${SOURCE_FILES} src/misc/memtracker.cpp)
     set(HEADER_FILES ${HEADER_FILES} src/misc/memtracker.h)
+    add_definitions(-DFEATURE_MEMTRACK)
 else()
     message("Missing logging support. Don't build mem tracker")
 endif()

src/misc/memtracker.h

@@ -5,7 +5,7 @@
 
 namespace memtrack {
 #define TRACK_OBJECT_ALLOCATION
-#ifdef TRACK_OBJECT_ALLOCATION
+#if defined(FEATURE_MEMTRACK) && defined(TRACK_OBJECT_ALLOCATION)
     extern void allocated(const char* name, void* address);
     extern void freed(const char* name, void* address);
     template <typename T>

src/protocol/PacketDecoder.h

@@ -12,10 +12,6 @@ namespace ts::connection {
     class CryptHandler;
 }
 
-namespace ts::stats {
-    class ConnectionStatistics;
-}
-
 namespace ts::protocol {
     enum struct PacketProcessResult {
         SUCCESS,

src/protocol/RawCommand.h

@@ -21,7 +21,11 @@ namespace ts::command {
         CommandFragment(const CommandFragment& other) = default;
         CommandFragment(CommandFragment&&) = default;
     };
+
+    /* Windows aligns stuff somewhat different */
+#ifndef WIN32
     static_assert(sizeof(CommandFragment) == 8 + sizeof(pipes::buffer));
+#endif
 
     struct ReassembledCommand {
         public: