Commit 95fd27d6 authored by Kean Johnston's avatar Kean Johnston

[2103] Merge branch 'trac2103'

parents 714ade4b 633b07c7
......@@ -218,7 +218,8 @@ public:
/// \param ec ASIO error code, completion code of asynchronous I/O issued
/// by the "server" to receive data.
/// \param length Amount of data received.
void udpReceiveHandler(error_code ec = error_code(), size_t length = 0) {
void udpReceiveHandler(asio::error_code ec = asio::error_code(),
size_t length = 0) {
// Expected state should be one greater than the last state.
EXPECT_EQ(static_cast<int>(expected_), static_cast<int>(last_) + 1);
last_ = expected_;
......@@ -281,7 +282,8 @@ public:
///
/// \param ec Completion error code of the send.
/// \param length Actual number of bytes sent.
void udpSendHandler(error_code ec = error_code(), size_t length = 0) {
void udpSendHandler(asio::error_code ec = asio::error_code(),
size_t length = 0) {
// Check send was OK
EXPECT_EQ(0, ec.value());
EXPECT_EQ(udp_length_, length);
......@@ -301,7 +303,8 @@ public:
///
/// \param socket Socket on which data will be received
/// \param ec Boost error code, value should be zero.
void tcpAcceptHandler(error_code ec = error_code(), size_t length = 0) {
void tcpAcceptHandler(asio::error_code ec = asio::error_code(),
size_t length = 0) {
// Expect that the accept completed without a problem.
EXPECT_EQ(0, ec.value());
......@@ -323,7 +326,8 @@ public:
/// \param ec ASIO error code, completion code of asynchronous I/O issued
/// by the "server" to receive data.
/// \param length Amount of data received.
void tcpReceiveHandler(error_code ec = error_code(), size_t length = 0) {
void tcpReceiveHandler(asio::error_code ec = asio::error_code(),
size_t length = 0) {
// Expect that the receive completed without a problem.
EXPECT_EQ(0, ec.value());
......@@ -409,7 +413,7 @@ public:
/// \param ec Boost error code, value should be zero.
/// \param length Number of bytes sent.
void tcpSendHandler(size_t expected_length = 0,
error_code ec = error_code(),
asio::error_code ec = asio::error_code(),
size_t length = 0)
{
EXPECT_EQ(0, ec.value()); // Expect no error
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment