Fix build

turtlecoin · Jul 28, 2019 · f387914 · f387914
1 parent 9327ea8
commit f387914
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/src/config/Ascii.h b/src/config/Ascii.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <string>
+
 const std::string windowsAsciiArt = "\n _______         _   _       _____      _        \n"
                                     "|__   __|       | | | |     / ____|    (_)      \n"
                                     "   | |_   _ _ __| |_| | ___| |     ___  _ _ __  \n"

diff --git a/src/crypto/crypto-ops.h b/src/crypto/crypto-ops.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 /* From fe.h */
 
 typedef int32_t fe[10];

diff --git a/src/platform/windows/system/TcpConnection.cpp b/src/platform/windows/system/TcpConnection.cpp
@@ -12,13 +12,21 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+// clang-format off
+/* Order of includes is important here, because, you know, *windows* ¯\_(ツ)_/¯ */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <winsock2.h>
+#include <ws2ipdef.h>
+// clang-format on
+
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
 
 #include <system/InterruptedException.h>
 #include <system/Ipv4Address.h>
-#include <winsock2.h>
-#include <ws2ipdef.h>
 
 namespace System
 {

diff --git a/src/platform/windows/system/TcpConnector.cpp b/src/platform/windows/system/TcpConnector.cpp
@@ -8,18 +8,22 @@
 #include <cassert>
 #include <stdexcept>
 
+// clang-format off
+/* Order of includes is important here, because, you know, *windows* ¯\_(ツ)_/¯ */
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <winsock2.h>
+#include <mswsock.h>
+// clang-format on
+
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
 #include "TcpConnection.h"
 
-#include <mswsock.h>
 #include <system/InterruptedException.h>
 #include <system/Ipv4Address.h>
-#include <winsock2.h>
 
 namespace System
 {

diff --git a/src/platform/windows/system/TcpListener.cpp b/src/platform/windows/system/TcpListener.cpp
@@ -8,18 +8,22 @@
 #include <cassert>
 #include <stdexcept>
 
+// clang-format off
+/* Order of includes is important here, because, you know, *windows* ¯\_(ツ)_/¯ */
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#include <winsock2.h>
+#include <mswsock.h>
+// clang-format on
+
 #include "Dispatcher.h"
 #include "ErrorMessage.h"
 #include "TcpConnection.h"
 
-#include <mswsock.h>
 #include <system/InterruptedException.h>
 #include <system/Ipv4Address.h>
-#include <winsock2.h>
 
 namespace System
 {

diff --git a/src/utilities/ThreadSafeQueue.h b/src/utilities/ThreadSafeQueue.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
 #include <queue>

diff --git a/src/wallet/IFusionManager.h b/src/wallet/IFusionManager.h
@@ -8,6 +8,7 @@
 #include <cstdint>
 #include <string>
 #include <utility>
+#include <vector>
 
 namespace CryptoNote
 {