blob: f13c86639c8c02be17a67dd80a2c3a66aae89a6b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- masari/contrib/epee/include/net/abstract_tcp_server2.inl
+++ masari/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -41,7 +41,8 @@
#include <boost/utility/value_init.hpp>
#include <boost/asio/deadline_timer.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> // TODO
-#include <boost/thread/v2/thread.hpp> // TODO
+#include <boost/thread/thread.hpp> // TODO
+#include <boost/thread/condition_variable.hpp> // TODO
#include "misc_language.h"
#include "pragma_comp_defs.h"
--- masari/contrib/epee/include/syncobj.h
+++ masari/contrib/epee/include/syncobj.h
@@ -31,10 +31,11 @@
#define __WINH_OBJ_H__
#include <boost/chrono/duration.hpp>
+#include <boost/thread/condition_variable.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/v2/thread.hpp>
+#include <boost/thread/thread.hpp>
namespace epee
{
|