Source: https://git.archlinux.org/svntogit/community.git/plain/trunk/boost-1.68.patch?h=packages/aegisub From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 9 Jul 2018 20:15:29 +0000 Subject: [PATCH] Keep using std::distance after Boost 1.68 src/search_replace_engine.cpp:256:14: error: call to 'distance' is ambiguous count += distance( ^~~~~~~~ /usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = boost::u32regex_iterator >] distance(_InputIter __first, _InputIter __last) ^ /usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = boost::u32regex_iterator >] distance(SinglePassIterator first, SinglePassIterator last) ^ --- src/search_replace_engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search_replace_engine.cpp b/src/search_replace_engine.cpp index 594c21e5e..14c71680d 100644 --- a/src/search_replace_engine.cpp +++ b/src/search_replace_engine.cpp @@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { 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(begin(text), end(text), *ms.re), boost::u32regex_iterator()); diag_field = u32regex_replace(text, *ms.re, settings.replace_with); f9c3e8d458ef9b'>diff
AgeCommit message (Expand)Author
2017-10-19gnu: python-unittest2: Update to 1.1.0....* gnu/packages/python.scm (python-unittest2): Update to 1.1.0. [source]: Use PYPI-URI. Add two patches. [arguments]: Add phase to run tests. [propagated-inputs]: Add PYTHON-SIX and PYTHON-TRACEBACK2. (python2-unittest2): Use 'package-with-python2'. * gnu/packages/patches/python2-unittest2-remove-argparse.patch: Rename to ... * gnu/packages/patches/python2-unittest2-remove-argparse.patch: ... this. * gnu/packages/patches/python-unittest2-python3-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Marius Bakke