merged changes from RC_1_0

2014-09-02 08:03:01 +00:00 · 2014-09-02 08:03:01 +00:00 · a44900e5db
parent 649d7646fb
commit a44900e5db
2 changed files with 2 additions and 0 deletions
--- a/test/test_dht.cpp
+++ b/test/test_dht.cpp
@ -46,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/kademlia/node_id.hpp"
 #include "libtorrent/kademlia/routing_table.hpp"
 #include "libtorrent/kademlia/item.hpp"
+#include "libtorrent/ed25519.hpp"
 #include <numeric>

 #include "test.hpp"
--- a/test/web_seed_suite.cpp
+++ b/test/web_seed_suite.cpp
@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.

 #include "test.hpp"
 #include "setup_transfer.hpp"
+#include "web_seed_suite.hpp"

 #include <boost/tuple/tuple.hpp>
 #include <boost/make_shared.hpp>