aboutsummaryrefslogtreecommitdiff
path: root/tests/unit_tests/epee_levin_protocol_handler_async.cpp
diff options
context:
space:
mode:
authorLee Clagett <code@leeclagett.com>2017-02-12 17:53:13 -0500
committerLee Clagett <code@leeclagett.com>2017-02-16 20:10:23 -0500
commit2cde2c02ca0e2bf1dc6f8fa78cd830f5989f9cea (patch)
treee0fb13b6e69c139e0cdf4557bc9fa99b7d492d81 /tests/unit_tests/epee_levin_protocol_handler_async.cpp
parentMerge pull request #1719 (diff)
downloadmonero-2cde2c02ca0e2bf1dc6f8fa78cd830f5989f9cea.tar.xz
switch to boost::thread for mingw build
Diffstat (limited to 'tests/unit_tests/epee_levin_protocol_handler_async.cpp')
-rw-r--r--tests/unit_tests/epee_levin_protocol_handler_async.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/unit_tests/epee_levin_protocol_handler_async.cpp b/tests/unit_tests/epee_levin_protocol_handler_async.cpp
index 2dd3ffe29..e1ce50e2f 100644
--- a/tests/unit_tests/epee_levin_protocol_handler_async.cpp
+++ b/tests/unit_tests/epee_levin_protocol_handler_async.cpp
@@ -28,8 +28,8 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-#include <mutex>
-#include <thread>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
#include "gtest/gtest.h"
@@ -59,7 +59,7 @@ namespace
virtual int invoke(int command, const std::string& in_buff, std::string& buff_out, test_levin_connection_context& context)
{
m_invoke_counter.inc();
- std::unique_lock<std::mutex> lock(m_mutex);
+ boost::unique_lock<boost::mutex> lock(m_mutex);
m_last_command = command;
m_last_in_buf = in_buff;
buff_out = m_invoke_out_buf;
@@ -69,7 +69,7 @@ namespace
virtual int notify(int command, const std::string& in_buff, test_levin_connection_context& context)
{
m_notify_counter.inc();
- std::unique_lock<std::mutex> lock(m_mutex);
+ boost::unique_lock<boost::mutex> lock(m_mutex);
m_last_command = command;
m_last_in_buf = in_buff;
return m_return_code;
@@ -115,7 +115,7 @@ namespace
unit_test::call_counter m_new_connection_counter;
unit_test::call_counter m_close_connection_counter;
- std::mutex m_mutex;
+ boost::mutex m_mutex;
int m_return_code;
std::string m_invoke_out_buf;
@@ -144,7 +144,7 @@ namespace
{
//std::cout << "test_connection::do_send()" << std::endl;
m_send_counter.inc();
- std::unique_lock<std::mutex> lock(m_mutex);
+ boost::unique_lock<boost::mutex> lock(m_mutex);
m_last_send_data.append(reinterpret_cast<const char*>(ptr), cb);
return m_send_return;
}
@@ -159,7 +159,7 @@ namespace
size_t send_counter() const { return m_send_counter.get(); }
const std::string& last_send_data() const { return m_last_send_data; }
- void reset_last_send_data() { std::unique_lock<std::mutex> lock(m_mutex); m_last_send_data.clear(); }
+ void reset_last_send_data() { boost::unique_lock<boost::mutex> lock(m_mutex); m_last_send_data.clear(); }
bool send_return() const { return m_send_return; }
void send_return(bool v) { m_send_return = v; }
@@ -172,7 +172,7 @@ namespace
test_levin_connection_context m_context;
unit_test::call_counter m_send_counter;
- std::mutex m_mutex;
+ boost::mutex m_mutex;
std::string m_last_send_data;
@@ -305,14 +305,14 @@ TEST_F(positive_test_connection_to_levin_protocol_handler_calls, concurent_handl
}
};
- const size_t thread_count = std::thread::hardware_concurrency();
- std::vector<std::thread> threads(thread_count);
- for (std::thread& th : threads)
+ const size_t thread_count = boost::thread::hardware_concurrency();
+ std::vector<boost::thread> threads(thread_count);
+ for (boost::thread& th : threads)
{
- th = std::thread(create_and_destroy_connections);
+ th = boost::thread(create_and_destroy_connections);
}
- for (std::thread& th : threads)
+ for (boost::thread& th : threads)
{
th.join();
}