mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

graphics/luxrender: unbreak with boost 1.68

Browse Source 
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<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(_InputIter __first, _InputIter __last)
^
/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
        distance(SinglePassIterator first, SinglePassIterator last)
        ^

PR:		229569
This commit is contained in:
Jan Beich 2018-07-09 19:42:28 +00:00
parent c8688e426d
commit 0666a25019
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=474296
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
graphics/luxrender/files/patch-accelerators_bvhaccel.cpp Normal file
View File

@ -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<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(_InputIter __first, _InputIter __last)
^
/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = std::__1::__wrap_iter<boost::shared_ptr<lux::BVHAccelTreeNode> *>]
distance(SinglePassIterator first, SinglePassIterator last)
^
--- accelerators/bvhaccel.cpp.orig 2016-05-09 21:21:17 UTC
+++ accelerators/bvhaccel.cpp
@@ -146,7 +146,7 @@ boost::shared_ptr<BVHAccelTreeNode> BVHAccel::BuildHie
vector<boost::shared_ptr<BVHAccelTreeNode> >::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);
}