summaryrefslogtreecommitdiff
path: root/src/util.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
committerCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
commit13154bc1a9b341f46994607fdde2e725444a6e21 (patch)
tree3fcf211b397092798b2aa39af4cc567d146a574c /src/util.cc
parent9853cbf566fdfdea096333c4caa788c29fa5c57b (diff)
Remove String namespace from around compose().compose
Diffstat (limited to 'src/util.cc')
-rw-r--r--src/util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.cc b/src/util.cc
index a36e2429..222b5a05 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -281,7 +281,7 @@ dcp::file_to_string (boost::filesystem::path p, uintmax_t max_length)
{
auto len = boost::filesystem::file_size (p);
if (len > max_length) {
- throw MiscError (String::compose("Unexpectedly long file (%1)", p.string()));
+ throw MiscError (compose("Unexpectedly long file (%1)", p.string()));
}
auto f = fopen_boost (p, "r");
@@ -414,7 +414,7 @@ dcp::unique_string (vector<string> existing, string base)
{
int const max_tries = existing.size() + 1;
for (int i = 0; i < max_tries; ++i) {
- string trial = String::compose("%1%2", base, i);
+ string trial = compose("%1%2", base, i);
if (find(existing.begin(), existing.end(), trial) == existing.end()) {
return trial;
}