diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-01-08 16:25:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-09 11:54:16 +0100 |
| commit | 12d1abf033654727d6ab6278087ff7cfc65d63f6 (patch) | |
| tree | b920b3c3614fc91a1cb2a220972042e6318a6fd4 /src/lib/util.cc | |
| parent | ad41d2dd987ffcd2068d9fbf4273108c9f796762 (diff) | |
Move ScopeGuard into libdcp.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |