projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c8c6b5
)
Remove uses of boost::system::error_code::message(), which seem to cause the pure...
author
Carl Hetherington
<cth@carlh.net>
Fri, 3 Jan 2014 14:07:57 +0000
(14:07 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 3 Jan 2014 14:07:57 +0000
(14:07 +0000)
src/lib/util.cc
patch
|
blob
|
history
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index ddc0a297459cef504b49300b25f874752ec2ba64..32b1805be622051fe6c3946888c5b994978abdc5 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-539,7
+539,7
@@
Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
} while (ec == boost::asio::error::would_block);
if (ec) {
} while (ec == boost::asio::error::would_block);
if (ec) {
- throw NetworkError (
ec.message (
));
+ throw NetworkError (
String::compose (_("error during async_connect (%1)"), ec.value ()
));
}
if (!_socket.is_open ()) {
}
if (!_socket.is_open ()) {
@@
-563,7
+563,7
@@
Socket::accept (int port)
_acceptor = 0;
if (ec) {
_acceptor = 0;
if (ec) {
- throw NetworkError (
ec.message (
));
+ throw NetworkError (
String::compose (_("error during async_accept (%1)"), ec.value ()
));
}
}
}
}
@@
-584,7
+584,7
@@
Socket::write (uint8_t const * data, int size)
} while (ec == boost::asio::error::would_block);
if (ec) {
} while (ec == boost::asio::error::would_block);
if (ec) {
- throw NetworkError (
ec.message (
));
+ throw NetworkError (
String::compose (_("error during async_write (%1)"), ec.value ()
));
}
}
}
}
@@
-612,7
+612,7
@@
Socket::read (uint8_t* data, int size)
} while (ec == boost::asio::error::would_block);
if (ec) {
} while (ec == boost::asio::error::would_block);
if (ec) {
- throw NetworkError (
ec.message (
));
+ throw NetworkError (
String::compose (_("error during async_read (%1)"), ec.value ()
));
}
}
}
}