mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
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.
This commit is contained in:
parent
26ba1086b8
commit
b6b80b0200
@ -22,6 +22,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include <libethereum/State.h>
|
#include <libethereum/State.h>
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
* Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
|
* Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <libdevcore/Common.h>
|
#include <libdevcore/Common.h>
|
||||||
#include <libdevcore/Exceptions.h>
|
#include <libdevcore/Exceptions.h>
|
||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/random.hpp>
|
#include <boost/random.hpp>
|
||||||
#include <boost/filesystem/path.hpp>
|
#include <boost/filesystem/path.hpp>
|
||||||
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||||
|
@ -22,10 +22,14 @@
|
|||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <random>
|
#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"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include <libdevcore/CommonIO.h>
|
#include <libdevcore/CommonIO.h>
|
||||||
#include <libethereum/CanonBlockChain.h>
|
#include <libethereum/CanonBlockChain.h>
|
||||||
#include <boost/test/unit_test.hpp>
|
|
||||||
#include "TestHelper.h"
|
#include "TestHelper.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
@ -21,11 +21,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
#include <libdevcore/CommonIO.h>
|
#include <libdevcore/CommonIO.h>
|
||||||
#include <libdevcrypto/TrieCommon.h>
|
#include <libdevcrypto/TrieCommon.h>
|
||||||
#include <boost/test/unit_test.hpp>
|
|
||||||
#include "TestHelper.h"
|
#include "TestHelper.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
1
net.cpp
1
net.cpp
@ -19,6 +19,7 @@
|
|||||||
* @date 2014
|
* @date 2014
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <libdevcore/Worker.h>
|
#include <libdevcore/Worker.h>
|
||||||
#include <libdevcrypto/Common.h>
|
#include <libdevcrypto/Common.h>
|
||||||
|
3
rlp.cpp
3
rlp.cpp
@ -22,11 +22,12 @@
|
|||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
#include <libdevcore/RLP.h>
|
#include <libdevcore/RLP.h>
|
||||||
#include <libdevcore/Common.h>
|
#include <libdevcore/Common.h>
|
||||||
#include <libdevcore/CommonIO.h>
|
#include <libdevcore/CommonIO.h>
|
||||||
#include <boost/test/unit_test.hpp>
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include "TestHelper.h"
|
#include "TestHelper.h"
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
* State test functions.
|
* State test functions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
|
3
trie.cpp
3
trie.cpp
@ -22,12 +22,13 @@
|
|||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <random>
|
#include <random>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
|
#include <boost/test/unit_test.hpp>
|
||||||
#include "JsonSpiritHeaders.h"
|
#include "JsonSpiritHeaders.h"
|
||||||
#include <libdevcore/CommonIO.h>
|
#include <libdevcore/CommonIO.h>
|
||||||
#include <libdevcrypto/TrieDB.h>
|
#include <libdevcrypto/TrieDB.h>
|
||||||
#include "TrieHash.h"
|
#include "TrieHash.h"
|
||||||
#include "MemTrie.h"
|
#include "MemTrie.h"
|
||||||
#include <boost/test/unit_test.hpp>
|
|
||||||
#include "TestHelper.h"
|
#include "TestHelper.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
1
vm.cpp
1
vm.cpp
@ -21,6 +21,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <libethereum/Executive.h>
|
#include <libethereum/Executive.h>
|
||||||
#include <libevm/VMFactory.h>
|
#include <libevm/VMFactory.h>
|
||||||
|
1
vm.h
1
vm.h
@ -25,6 +25,7 @@ along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
#include <boost/test/unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
#include <json_spirit/json_spirit.h>
|
#include <json_spirit/json_spirit.h>
|
||||||
#include <libdevcore/Log.h>
|
#include <libdevcore/Log.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user