aboutsummaryrefslogtreecommitdiff
path: root/multimedia/aegisub/files/patch-src_search__replace__engine.cpp
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-07-09 19:42:07 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-07-09 19:42:07 +0000
commit649246839ec37405086aa207af2bdafbce555324 (patch)
tree73a060dbd69d27fd5421424c9fc2b7a2440c0973 /multimedia/aegisub/files/patch-src_search__replace__engine.cpp
parentc9823df9604663797819fd1cc610e4d732f2841b (diff)
downloadports-649246839ec37405086aa207af2bdafbce555324.tar.gz
ports-649246839ec37405086aa207af2bdafbce555324.zip
Notes
Diffstat (limited to 'multimedia/aegisub/files/patch-src_search__replace__engine.cpp')
-rw-r--r--multimedia/aegisub/files/patch-src_search__replace__engine.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/multimedia/aegisub/files/patch-src_search__replace__engine.cpp b/multimedia/aegisub/files/patch-src_search__replace__engine.cpp
new file mode 100644
index 000000000000..e52abd0b78d0
--- /dev/null
+++ b/multimedia/aegisub/files/patch-src_search__replace__engine.cpp
@@ -0,0 +1,26 @@
+After https://github.com/boostorg/range/commit/69409ed63a9e1 build fails:
+
+src/search_replace_engine.cpp:315:14: error: call to
+ 'distance' is ambiguous
+ count += distance(
+ ^~~~~~~~
+/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
+ boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+distance(_InputIter __first, _InputIter __last)
+^
+/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
+ boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
+ distance(SinglePassIterator first, SinglePassIterator last)
+ ^
+
+--- src/search_replace_engine.cpp.orig 2014-12-08 00:07:09 UTC
++++ src/search_replace_engine.cpp
+@@ -312,7 +312,7 @@
+ if (MatchState ms = matches(&diag, 0)) {
+ auto& diag_field = diag.*get_dialogue_field(settings.field);
+ std::string const& text = diag_field.get();
+- count += distance(
++ count += std::distance(
+ boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
+ boost::u32regex_iterator<std::string::const_iterator>());
+ diag_field = u32regex_replace(text, *ms.re, settings.replace_with);