diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-11 20:15:10 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-11 20:15:10 +0200 |
| commit | dfd0e9c97d80c5cd7115d6cbb49cce08168071b6 (patch) | |
| tree | 7bb5c56c18c83f3180101e310198cb3e3fdf1ab7 /contrib/otshell_utils/lib_common1.hpp | |
| parent | Merge pull request #711 (diff) | |
| parent | Need to link boost::chrono in more places now (diff) | |
| download | monero-dfd0e9c97d80c5cd7115d6cbb49cce08168071b6.tar.xz | |
Merge pull request #712
66c2fc7 Need to link boost::chrono in more places now (Howard Chu)
b937a2c Use boost::thread instead of std::thread (Howard Chu)
Diffstat (limited to 'contrib/otshell_utils/lib_common1.hpp')
| -rw-r--r-- | contrib/otshell_utils/lib_common1.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/otshell_utils/lib_common1.hpp b/contrib/otshell_utils/lib_common1.hpp index 456e63fbb..2cb466beb 100644 --- a/contrib/otshell_utils/lib_common1.hpp +++ b/contrib/otshell_utils/lib_common1.hpp @@ -19,9 +19,11 @@ #include <functional> #include <memory> -#include <thread> #include <atomic> -#include <mutex> +#include <boost/thread.hpp> +#include <boost/thread/mutex.hpp> +#include <boost/thread/recursive_mutex.hpp> +#include <boost/thread/lock_guard.hpp> // list of thigs from libraries that we pull into namespace nOT::nNewcli @@ -45,8 +47,7 @@ using std::shared_ptr; \ using std::weak_ptr; \ using std::enable_shared_from_this; \ - using std::mutex; \ - using std::lock_guard; \ + using boost::lock_guard; \ #endif |