X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=997470a210d9437d87efa81a8bf1e12a81e8d69e;hb=12d1abf033654727d6ab6278087ff7cfc65d63f6;hp=d23989afaadff0556842b8ba5fe6f01e86b96efd;hpb=ad41d2dd987ffcd2068d9fbf4273108c9f796762;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index d23989afa..997470a21 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -46,7 +46,6 @@
 #include "ratio.h"
 #include "rect.h"
 #include "render_text.h"
-#include "scope_guard.h"
 #include "string_text.h"
 #include "text_decoder.h"
 #include "util.h"
@@ -58,6 +57,7 @@
 #include <dcp/locale_convert.h>
 #include <dcp/picture_asset.h>
 #include <dcp/raw_convert.h>
+#include <dcp/scope_guard.h>
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
 #include <dcp/util.h>
@@ -1094,7 +1094,7 @@ word_wrap(string input, int columns)
 	icu::Locale locale;
 	UErrorCode status = U_ZERO_ERROR;
 	auto iter = icu::BreakIterator::createLineInstance(locale, status);
-	ScopeGuard sg = [iter]() { delete iter; };
+	dcp::ScopeGuard sg = [iter]() { delete iter; };
 	if (U_FAILURE(status)) {
 		return input;
 	}