diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-04-28 17:01:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-04-28 17:01:32 +0200 |
| commit | 5bca8c6998c3f5d4674b428dbfc223b0510faeb4 (patch) | |
| tree | 0ae9acd8da9cf9f9bb90d738d15d03874d3b3547 | |
| parent | Merge pull request #3703 (diff) | |
| parent | epee: Drop deprecated Boost.Thread header (diff) | |
| download | monero-5bca8c6998c3f5d4674b428dbfc223b0510faeb4.tar.xz | |
Merge pull request #3667
53a1962d epee: Drop deprecated Boost.Thread header (Jan Beich)
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 3 | ||||
| -rw-r--r-- | contrib/epee/include/syncobj.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 195ee2f0c..52b4c85ba 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/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" diff --git a/contrib/epee/include/syncobj.h b/contrib/epee/include/syncobj.h index 8912fc018..9f2404856 100644 --- a/contrib/epee/include/syncobj.h +++ b/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 { |