diff options
| author | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
|---|---|---|
| committer | cah <cth@carlh.net> | 2025-07-10 22:47:19 +0200 |
| commit | 4be4e97abf911e7633172ada950d107a3ed28834 (patch) | |
| tree | c9deceb5f3684fa081db0613da88264732093fcb /src/lib/dcpomatic_socket.cc | |
| parent | 727c1aa7da8b325dfa38c8443b1dd356acaf6ec3 (diff) | |
| parent | 42bde2d97039f6d0d645d83db90612d18ebf225a (diff) | |
Merge branch 'compose-to-fmt-take2'
This removes all uses of String::compose, replacing them with fmt and
updating the i18n strings where required.
Diffstat (limited to 'src/lib/dcpomatic_socket.cc')
| -rw-r--r-- | src/lib/dcpomatic_socket.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc index 9507128a2..7aecf752f 100644 --- a/src/lib/dcpomatic_socket.cc +++ b/src/lib/dcpomatic_socket.cc @@ -19,7 +19,6 @@ */ -#include "compose.hpp" #include "dcpomatic_assert.h" #include "dcpomatic_log.h" #include "dcpomatic_socket.h" @@ -76,7 +75,7 @@ Socket::connect(boost::asio::ip::basic_resolver_results<boost::asio::ip::tcp> en } while (ec == boost::asio::error::would_block); if (ec) { - throw NetworkError(String::compose(_("error during async_connect: (%1)"), error_details(ec))); + throw NetworkError(fmt::format(_("error during async_connect: ({})"), error_details(ec))); } if (!_socket.is_open ()) { @@ -106,7 +105,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)"), error_details(ec))); + throw NetworkError(fmt::format(_("error during async_connect ({})"), error_details(ec))); } if (!_socket.is_open ()) { @@ -157,7 +156,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)"), error_details(ec))); + throw NetworkError(fmt::format(_("error during async_write ({})"), error_details(ec))); } if (_write_digester) { @@ -198,7 +197,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)"), error_details(ec))); + throw NetworkError(fmt::format(_("error during async_read ({})"), error_details(ec))); } if (_read_digester) { |