diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /src/lib/dcpomatic_socket.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/lib/dcpomatic_socket.cc')
| -rw-r--r-- | src/lib/dcpomatic_socket.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc index a92a294e6..a1670de55 100644 --- a/src/lib/dcpomatic_socket.cc +++ b/src/lib/dcpomatic_socket.cc @@ -19,9 +19,9 @@ */ #include "dcpomatic_socket.h" -#include "compose.hpp" #include "exceptions.h" #include "dcpomatic_assert.h" +#include <dcp/compose.h> #include <boost/bind/bind.hpp> #include <boost/lambda/lambda.hpp> #include <iostream> @@ -66,7 +66,7 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint) } while (ec == boost::asio::error::would_block); if (ec) { - throw NetworkError (String::compose (_("error during async_connect (%1)"), ec.value ())); + throw NetworkError (dcp::compose (_("error during async_connect (%1)"), ec.value ())); } if (!_socket.is_open ()) { @@ -91,7 +91,7 @@ Socket::write (uint8_t const * data, int size) } while (ec == boost::asio::error::would_block); if (ec) { - throw NetworkError (String::compose (_("error during async_write (%1)"), ec.value ())); + throw NetworkError (dcp::compose (_("error during async_write (%1)"), ec.value ())); } if (_write_digester) { @@ -123,7 +123,7 @@ Socket::read (uint8_t* data, int size) } while (ec == boost::asio::error::would_block); if (ec) { - throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ())); + throw NetworkError (dcp::compose (_("error during async_read (%1)"), ec.value ())); } if (_read_digester) { |