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.

This commit is contained in:
jhuntley 2015-02-26 16:05:53 -05:00
parent 5ae585f7cf
commit e229b5d291
15 changed files with 20 additions and 51 deletions

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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"

View File

@ -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>

2
vm.cpp
View File

@ -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>

2
vm.h
View File

@ -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>

View File

@ -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>