From owner-svn-ports-head@freebsd.org Mon Jul 9 19:42:40 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF8991026D9B; Mon, 9 Jul 2018 19:42:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E37E829E9; Mon, 9 Jul 2018 19:42:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56F5D196A3; Mon, 9 Jul 2018 19:42:39 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w69JgdF1019689; Mon, 9 Jul 2018 19:42:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w69Jgd2H019688; Mon, 9 Jul 2018 19:42:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807091942.w69Jgd2H019688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Jul 2018 19:42:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474297 - head/www/anyterm/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/www/anyterm/files X-SVN-Commit-Revision: 474297 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2018 19:42:40 -0000 Author: jbeich Date: Mon Jul 9 19:42:38 2018 New Revision: 474297 URL: https://svnweb.freebsd.org/changeset/ports/474297 Log: www/anyterm: unbreak with boost 1.68 ../src/Anyterm.cc: In member function 'Anyterm::response_t Anyterm::process_request(const pbe::HttpRequest&)': ../src/Anyterm.cc:174:74: error: call of overloaded 'distance(std::map >::const_iterator, std::map >::const_iterator)' is ambiguous int n_sessions = distance(sessions_rd->begin(),sessions_rd->end()); ^ In file included from /usr/local/lib/gcc6/include/c++/bits/stl_algobase.h:66:0, from /usr/local/lib/gcc6/include/c++/bits/stl_tree.h:63, from /usr/local/lib/gcc6/include/c++/map:60, from ../src/Anyterm.hh:25, from ../src/Anyterm.cc:20: /usr/local/lib/gcc6/include/c++/bits/stl_iterator_base_funcs.h:135:5: note: candidate: typename std::iterator_traits<_Iterator>::difference_type std::distance(_InputIterator, _InputIterator) [with _InputIterator = std::_Rb_tree_const_iterator > >; typename std::iterator_traits<_Iterator>::difference_type = int] distance(_InputIterator __first, _InputIterator __last) ^~~~~~~~ In file included from /usr/local/include/boost/range/distance.hpp:18:0, from /usr/local/include/boost/range/functions.hpp:21, from /usr/local/include/boost/range/iterator_range_core.hpp:38, from /usr/local/include/boost/lexical_cast.hpp:30, from ../libpbe/include/FileDescriptor.hh:26, from ../src/Activity.hh:27, from ../src/Session.hh:39, from ../src/Anyterm.hh:32, from ../src/Anyterm.cc:20: /usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate: typename boost::iterators::iterator_difference::type boost::iterators::distance_adl_barrier::distance(SinglePassIterator, SinglePassIterator) [with SinglePassIterator = std::_Rb_tree_const_iterator > >; typename boost::iterators::iterator_difference::type = int] distance(SinglePassIterator first, SinglePassIterator last) ^~~~~~~~ PR: 229569 Added: head/www/anyterm/files/patch-src_Anyterm.cc (contents, props changed) Added: head/www/anyterm/files/patch-src_Anyterm.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/anyterm/files/patch-src_Anyterm.cc Mon Jul 9 19:42:38 2018 (r474297) @@ -0,0 +1,38 @@ +After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails: + +../src/Anyterm.cc: In member function 'Anyterm::response_t Anyterm::process_request(const pbe::HttpRequest&)': +../src/Anyterm.cc:174:74: error: call of overloaded 'distance(std::map >::const_iterator, std::map >::const_iterator)' is ambiguous + int n_sessions = distance(sessions_rd->begin(),sessions_rd->end()); + ^ +In file included from /usr/local/lib/gcc6/include/c++/bits/stl_algobase.h:66:0, + from /usr/local/lib/gcc6/include/c++/bits/stl_tree.h:63, + from /usr/local/lib/gcc6/include/c++/map:60, + from ../src/Anyterm.hh:25, + from ../src/Anyterm.cc:20: +/usr/local/lib/gcc6/include/c++/bits/stl_iterator_base_funcs.h:135:5: note: candidate: typename std::iterator_traits<_Iterator>::difference_type std::distance(_InputIterator, _InputIterator) [with _InputIterator = std::_Rb_tree_const_iterator > >; typename std::iterator_traits<_Iterator>::difference_type = int] + distance(_InputIterator __first, _InputIterator __last) + ^~~~~~~~ +In file included from /usr/local/include/boost/range/distance.hpp:18:0, + from /usr/local/include/boost/range/functions.hpp:21, + from /usr/local/include/boost/range/iterator_range_core.hpp:38, + from /usr/local/include/boost/lexical_cast.hpp:30, + from ../libpbe/include/FileDescriptor.hh:26, + from ../src/Activity.hh:27, + from ../src/Session.hh:39, + from ../src/Anyterm.hh:32, + from ../src/Anyterm.cc:20: +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate: typename boost::iterators::iterator_difference::type boost::iterators::distance_adl_barrier::distance(SinglePassIterator, SinglePassIterator) [with SinglePassIterator = std::_Rb_tree_const_iterator > >; typename boost::iterators::iterator_difference::type = int] + distance(SinglePassIterator first, SinglePassIterator last) + ^~~~~~~~ + +--- src/Anyterm.cc.orig 2008-11-24 12:45:25 UTC ++++ src/Anyterm.cc +@@ -171,7 +171,7 @@ Anyterm::response_t Anyterm::process_request(const Htt + + { + locked_sessions_t::reader sessions_rd(sessions); +- int n_sessions = distance(sessions_rd->begin(),sessions_rd->end()); ++ int n_sessions = std::distance(sessions_rd->begin(),sessions_rd->end()); + if (n_sessions>=max_sessions) { + throw Error("The maximum number of concurrent sessions has been reached"); + }