Revert all asio.h includes except for in 2 files, DebuggingStateWrapper.h and Transact.cpp. After enabling WIN32_LEAN_AND_MEAN, all the asio.h include issues, commit 20b6e24ffcab088e71092e07030a377d3135da3c, went away.

10 years ago · 6d62e3ab26
43 changed files with 69 additions and 162 deletions
--- a/alethzero/MainWin.h
+++ b/alethzero/MainWin.h
@ -27,9 +27,6 @@

 #include <map>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QMutex>
--- a/alethzero/OurWebThreeStubServer.h
+++ b/alethzero/OurWebThreeStubServer.h
@ -20,7 +20,6 @@
 */

 #include <queue>
-#include <boost/asio.hpp>
 #include <QtCore/QObject>
 #include <libdevcore/Guards.h>
 #include <libethcore/CommonJS.h>
--- a/alethzero/Transact.cpp
+++ b/alethzero/Transact.cpp
@ -19,6 +19,9 @@
 * @date 2015
 */

+// Make sure boost/asio.hpp is included before windows.h.
+#include <boost/asio.hpp>
+
 #include "Transact.h"

 #include <fstream>
--- a/eth/main.cpp
+++ b/eth/main.cpp
@ -26,8 +26,6 @@
 #include <iostream>
 #include <signal.h>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>

--- a/libethereum/All.h
+++ b/libethereum/All.h
@ -1,8 +1,5 @@
 #pragma once

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include "Account.h"
 #include "CanonBlockChain.h"
 #include "Client.h"
--- a/libethereum/Client.h
+++ b/libethereum/Client.h
@ -28,8 +28,6 @@
 #include <string>
 #include <array>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/utility.hpp>

 #include <libdevcore/Common.h>
--- a/libethereum/EthereumHost.h
+++ b/libethereum/EthereumHost.h
@ -29,9 +29,6 @@
 #include <utility>
 #include <thread>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Guards.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/RangeMask.h>
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@ -25,8 +25,6 @@
 #include <thread>
 #include <mutex>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

 #include <libdevcore/Common.h>
--- a/libp2p/Host.h
+++ b/libp2p/Host.h
@ -31,9 +31,6 @@
 #include <thread>
 #include <chrono>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Guards.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/RangeMask.h>
--- a/libp2p/Network.cpp
+++ b/libp2p/Network.cpp
@ -26,8 +26,6 @@
 #include <ifaddrs.h>
 #endif

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

 #include <libdevcore/Common.h>
--- a/libp2p/NodeTable.h
+++ b/libp2p/NodeTable.h
@ -24,8 +24,6 @@
 #include <algorithm>
 #include <deque>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/integer/static_log2.hpp>

 #include <libp2p/UDP.h>
--- a/libp2p/Session.h
+++ b/libp2p/Session.h
@ -28,9 +28,6 @@
 #include <memory>
 #include <utility>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/RangeMask.h>
--- a/libp2p/UDP.h
+++ b/libp2p/UDP.h
@ -27,9 +27,6 @@
 #include <deque>
 #include <array>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
 #include <libdevcrypto/SHA3.h>
--- a/libwebthree/WebThree.cpp
+++ b/libwebthree/WebThree.cpp
@ -24,8 +24,6 @@
 #include <chrono>
 #include <thread>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/filesystem.hpp>

 #include <libdevcore/Log.h>
--- a/libwhisper/Common.h
+++ b/libwhisper/Common.h
@ -24,9 +24,6 @@
 #include <string>
 #include <chrono>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
--- a/libwhisper/Interface.h
+++ b/libwhisper/Interface.h
@ -27,9 +27,6 @@
 #include <memory>
 #include <utility>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/SHA3.h>
--- a/libwhisper/Message.h
+++ b/libwhisper/Message.h
@ -27,9 +27,6 @@
 #include <memory>
 #include <utility>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
--- a/libwhisper/WhisperHost.h
+++ b/libwhisper/WhisperHost.h
@ -27,9 +27,6 @@
 #include <memory>
 #include <utility>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/RLP.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/Guards.h>
--- a/libwhisper/WhisperPeer.h
+++ b/libwhisper/WhisperPeer.h
@ -27,9 +27,6 @@
 #include <memory>
 #include <utility>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/SHA3.h>
--- a/mix/AppContext.cpp
+++ b/mix/AppContext.cpp
@ -22,9 +22,6 @@
 * - KeyEventManager
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <QMessageBox>
 #include <QClipboard>
 #include <QQmlComponent>
--- a/mix/AppContext.h
+++ b/mix/AppContext.h
@ -27,9 +27,6 @@

 #pragma once

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <memory>
 #include <QUrl>
 #include <QObject>
--- a/mix/CodeEditorExtensionManager.cpp
+++ b/mix/CodeEditorExtensionManager.cpp
@ -20,9 +20,6 @@
 * Ethereum IDE client.
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <QQuickItem>
 #include <QGraphicsObject>
 #include <QQmlEngine>
--- a/mix/DebuggingStateWrapper.h
+++ b/mix/DebuggingStateWrapper.h
@ -22,6 +22,9 @@

 #pragma once

+// Make sure boost/asio.hpp is included before windows.h.
+#include <boost/asio.hpp>
+
 #include <QStringList>
 #include <QMap>
 #include <libdevcore/Common.h>
--- a/mix/Extension.cpp
+++ b/mix/Extension.cpp
@ -22,9 +22,6 @@
 #include <QDebug>
 #include <QQmlApplicationEngine>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libevm/VM.h>
 #include <libwebthree/WebThree.h>
 #include "Extension.h"
--- a/mix/Extension.h
+++ b/mix/Extension.h
@ -19,9 +19,6 @@

 #pragma once

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <QApplication>
 #include <QQmlComponent>

--- a/mix/QContractDefinition.cpp
+++ b/mix/QContractDefinition.cpp
@ -21,9 +21,6 @@

 #include <QObject>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Scanner.h>
--- a/neth/main.cpp
+++ b/neth/main.cpp
@ -26,8 +26,6 @@
 #include <iostream>
 #include <signal.h>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>

--- a/test/TestHelper.cpp
+++ b/test/TestHelper.cpp
@ -24,8 +24,6 @@
 #include <thread>
 #include <chrono>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/filesystem/path.hpp>

 #include <libethereum/Client.h>
--- a/test/TestHelper.h
+++ b/test/TestHelper.h
@ -23,8 +23,6 @@

 #include <functional>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include "JsonSpiritHeaders.h"
--- a/test/checkRandomTest.cpp
+++ b/test/checkRandomTest.cpp
@ -20,9 +20,6 @@
 * Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
-
 #include <libdevcore/Common.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Log.h>
--- a/test/createRandomTest.cpp
+++ b/test/createRandomTest.cpp
@ -24,8 +24,6 @@
 #include <iostream>
 #include <chrono>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/random.hpp>
 #include <boost/filesystem/path.hpp>

--- a/test/fork.cpp
+++ b/test/fork.cpp
@ -20,8 +20,6 @@
 * Tests for different forking behavior
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>

--- a/test/genesis.cpp
+++ b/test/genesis.cpp
@ -23,8 +23,6 @@
 #include <fstream>
 #include <random>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include "JsonSpiritHeaders.h"
--- a/test/hexPrefix.cpp
+++ b/test/hexPrefix.cpp
@ -22,8 +22,6 @@

 #include <fstream>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include "JsonSpiritHeaders.h"
--- a/test/net.cpp
+++ b/test/net.cpp
@ -19,8 +19,6 @@
 * @date 2014
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include <libdevcore/Worker.h>
--- a/test/rlp.cpp
+++ b/test/rlp.cpp
@ -23,8 +23,6 @@
 #include <fstream>
 #include <sstream>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include <libdevcore/Log.h>
--- a/test/state.cpp
+++ b/test/state.cpp
@ -20,8 +20,6 @@
 * State test functions.
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/test/unit_test.hpp>

--- a/test/trie.cpp
+++ b/test/trie.cpp
@ -23,8 +23,6 @@
 #include <fstream>
 #include <random>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include "JsonSpiritHeaders.h"
--- a/test/txTest.cpp
+++ b/test/txTest.cpp
@ -20,8 +20,6 @@
 * Simple peer transaction send test.
 */

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>

--- a/test/vm.cpp
+++ b/test/vm.cpp
@ -22,8 +22,6 @@

 #include <chrono>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/filesystem.hpp>

 #include <libethereum/Executive.h>
--- a/test/vm.h
+++ b/test/vm.h
@ -26,8 +26,6 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 #include <fstream>
 #include <cstdint>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include <json_spirit/json_spirit.h>
--- a/test/whisperTopic.cpp
+++ b/test/whisperTopic.cpp
@ -20,8 +20,6 @@
 */
 #include <functional>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/test/unit_test.hpp>

 #include <libp2p/Host.h>
--- a/third/MainWin.cpp
+++ b/third/MainWin.cpp
@ -21,8 +21,6 @@

 #include <fstream>

-// Make sure boost/asio.hpp is included before windows.h.
-#include <boost/asio.hpp>
 #include <boost/algorithm/string.hpp>

 #include <QtNetwork/QNetworkReply>