diff options
| author | jhuntley <jhuntley@houghtonassociates.com> | 2015-01-17 05:55:46 +0800 |
|---|---|---|
| committer | jhuntley <jhuntley@houghtonassociates.com> | 2015-03-05 00:17:45 +0800 |
| commit | 26ba1086b82497f9100c0283955c6ea4e742aee0 (patch) | |
| tree | fa285535b97e8efc19cd20f0bc663bfc48398b27 | |
| parent | b5693332fb66e157e135bbeb6a798e83b0f33a6a (diff) | |
| download | dexon-solidity-26ba1086b82497f9100c0283955c6ea4e742aee0.tar.gz dexon-solidity-26ba1086b82497f9100c0283955c6ea4e742aee0.tar.zst dexon-solidity-26ba1086b82497f9100c0283955c6ea4e742aee0.zip | |
Avoid boost include order issue on windows:
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue/16288859#16288859
Make sure boost/asio.hpp is included before windows.h.
| -rw-r--r-- | TestHelper.cpp | 1 | ||||
| -rw-r--r-- | fork.cpp | 2 | ||||
| -rw-r--r-- | txTest.cpp | 2 | ||||
| -rw-r--r-- | whisperTopic.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index f82b72b8..4ee53f88 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -23,6 +23,7 @@ #include <thread> #include <chrono> +#include <boost/asio.hpp> #include <boost/filesystem/path.hpp> #include <libethereum/Client.h> #include <liblll/Compiler.h> @@ -19,7 +19,7 @@ * @date 2014 * Tests for different forking behavior */ - +#include <boost/asio.hpp> #include <boost/test/unit_test.hpp> #include <boost/filesystem/operations.hpp> #include <libethereum/Client.h> @@ -19,7 +19,7 @@ * @date 2014 * Simple peer transaction send test. */ - +#include <boost/asio.hpp> #include <boost/test/unit_test.hpp> #include <boost/filesystem/operations.hpp> #include <libethereum/Client.h> diff --git a/whisperTopic.cpp b/whisperTopic.cpp index 4609c957..2f90b4fb 100644 --- a/whisperTopic.cpp +++ b/whisperTopic.cpp @@ -19,6 +19,7 @@ * @date 2014 */ #include <functional> +#include <boost/asio.hpp> #include <boost/test/unit_test.hpp> #include <libp2p/Host.h> #include <libwhisper/WhisperPeer.h> |