diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:05:56 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:05:56 +0200 |
| commit | f9c3bb397743e2556b55f8f6433aec8e731a81e8 (patch) | |
| tree | 261ef68758b7c208577fa442df431ca2c9d1e9ba /src/stl_text_reader.cc | |
| parent | 8115d0f378b4c52a2ffca86ef8cfd949e9272d87 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'src/stl_text_reader.cc')
| -rw-r--r-- | src/stl_text_reader.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/stl_text_reader.cc b/src/stl_text_reader.cc index f08a438..4859823 100644 --- a/src/stl_text_reader.cc +++ b/src/stl_text_reader.cc @@ -18,7 +18,7 @@ */ #include "stl_text_reader.h" -#include "compose.hpp" +#include <dcp/compose.h> #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> #include <vector> @@ -69,7 +69,7 @@ STLTextReader::STLTextReader (istream& in) set (name, value); } else { - warn (String::compose ("Unrecognised line %1", line)); + warn (dcp::compose ("Unrecognised line %1", line)); } } else { /* "Normal" lines */ @@ -80,7 +80,7 @@ STLTextReader::STLTextReader (istream& in) } if (divider[0] == string::npos || divider[1] == string::npos || divider[0] <= 1 || divider[1] >= line.length() - 1) { - warn (String::compose ("Unrecognised line %1", line)); + warn (dcp::compose ("Unrecognised line %1", line)); continue; } @@ -93,7 +93,7 @@ STLTextReader::STLTextReader (istream& in) optional<Time> to = time (to_string); if (!from || !to) { - warn (String::compose ("Unrecognised line %1", line)); + warn (dcp::compose ("Unrecognised line %1", line)); continue; } @@ -138,7 +138,7 @@ STLTextReader::time (string t) const vector<string> b; split (b, t, is_any_of (":")); if (b.size() != 4) { - warn (String::compose ("Unrecognised time %1", t)); + warn (dcp::compose ("Unrecognised time %1", t)); return optional<Time> (); } |