From owner-svn-ports-head@freebsd.org Sat Jul 14 23:15:02 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 DDEB91042425; Sat, 14 Jul 2018 23:15:01 +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 8F4E88D394; Sat, 14 Jul 2018 23:15:01 +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 578DE25894; Sat, 14 Jul 2018 23:15:01 +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 w6ENF1BG030033; Sat, 14 Jul 2018 23:15:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ENF1pf030032; Sat, 14 Jul 2018 23:15:01 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807142315.w6ENF1pf030032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 14 Jul 2018 23:15:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474653 - head/graphics/luxrender14/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/luxrender14/files X-SVN-Commit-Revision: 474653 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: Sat, 14 Jul 2018 23:15:02 -0000 Author: jbeich Date: Sat Jul 14 23:15:00 2018 New Revision: 474653 URL: https://svnweb.freebsd.org/changeset/ports/474653 Log: graphics/luxrender14: unbreak with boost 1.68 accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous u_int middle = distance(list.begin(), it); ^~~~~~~~ /usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter *>] distance(_InputIter __first, _InputIter __last) ^ /usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter *>] distance(SinglePassIterator first, SinglePassIterator last) ^ PR: 229569 Reported by: antoine (via exp-run) Added: head/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp (contents, props changed) Added: head/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/luxrender14/files/patch-accelerators_bvhaccel.cpp Sat Jul 14 23:15:00 2018 (r474653) @@ -0,0 +1,23 @@ +After http://github.com/boostorg/range/commit/69409ed63a9e1 build fails: + +accelerators/bvhaccel.cpp:149:19: error: call to 'distance' is ambiguous + u_int middle = distance(list.begin(), it); + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = std::__1::__wrap_iter *>] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter *>] + distance(SinglePassIterator first, SinglePassIterator last) + ^ + +--- accelerators/bvhaccel.cpp.orig 2015-01-20 23:10:10 UTC ++++ accelerators/bvhaccel.cpp +@@ -146,7 +146,7 @@ boost::shared_ptr BVHAccel::BuildHie + + vector >::iterator it = + partition(list.begin()+splits[j], list.begin()+splits[j+1], bind2nd(ptr_fun(bvh_ltf[splitAxis]), splitValue)); +- u_int middle = distance(list.begin(), it); ++ u_int middle = std::distance(list.begin(), it); + middle = max(splits[j]+1, min(splits[j+1]-1, middle)); // Make sure coincidental BBs are still split + splits.insert(splits.begin()+j+1, middle); + }