From owner-svn-ports-all@freebsd.org Mon Jul 9 19:42:19 2018 Return-Path: Delivered-To: svn-ports-all@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 8521A1026C77; Mon, 9 Jul 2018 19:42:19 +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 37372827EB; Mon, 9 Jul 2018 19:42:19 +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 1982B1968F; Mon, 9 Jul 2018 19:42:19 +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 w69JgI2m014838; Mon, 9 Jul 2018 19:42:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w69JgIKI014837; Mon, 9 Jul 2018 19:42:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201807091942.w69JgIKI014837@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:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474295 - head/net/kea/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/net/kea/files X-SVN-Commit-Revision: 474295 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2018 19:42:19 -0000 Author: jbeich Date: Mon Jul 9 19:42:18 2018 New Revision: 474295 URL: https://svnweb.freebsd.org/changeset/ports/474295 Log: net/kea: unbreak with boost 1.68 libdhcp++.cc:420:24: error: call to 'distance' is ambiguous num_defs = distance(range.first, range.second); ^~~~~~~~ libdhcp++.cc:428:24: error: call to 'distance' is ambiguous num_defs = distance(range.first, range.second); ^~~~~~~~ libdhcp++.cc:537:24: error: call to 'distance' is ambiguous num_defs = distance(range.first, range.second); ^~~~~~~~ libdhcp++.cc:545:24: error: call to 'distance' is ambiguous num_defs = distance(range.first, range.second); ^~~~~~~~ libdhcp++.cc:637:31: error: call to 'distance' is ambiguous size_t num_defs = distance(range.first, range.second); ^~~~~~~~ libdhcp++.cc:743:35: error: call to 'distance' is ambiguous size_t num_defs = distance(range.first, range.second); ^~~~~~~~ /usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = boost::multi_index::detail::hashed_index_iterator, std::__1::allocator > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array > >, boost::multi_index::detail::hashed_index_global_iterator_tag>] distance(_InputIter __first, _InputIter __last) ^ /usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = boost::multi_index::detail::hashed_index_iterator, std::__1::allocator > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array > >, boost::multi_index::detail::hashed_index_global_iterator_tag>] distance(SinglePassIterator first, SinglePassIterator last) ^ PR: 229569 Added: head/net/kea/files/patch-src_lib_dhcp_libdhcp++.cc (contents, props changed) Added: head/net/kea/files/patch-src_lib_dhcp_libdhcp++.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/kea/files/patch-src_lib_dhcp_libdhcp++.cc Mon Jul 9 19:42:18 2018 (r474295) @@ -0,0 +1,83 @@ +After https://github.com/boostorg/range/commit/69409ed63a9e1 build fails: + +libdhcp++.cc:420:24: error: call to 'distance' is ambiguous + num_defs = distance(range.first, range.second); + ^~~~~~~~ +libdhcp++.cc:428:24: error: call to 'distance' is ambiguous + num_defs = distance(range.first, range.second); + ^~~~~~~~ +libdhcp++.cc:537:24: error: call to 'distance' is ambiguous + num_defs = distance(range.first, range.second); + ^~~~~~~~ +libdhcp++.cc:545:24: error: call to 'distance' is ambiguous + num_defs = distance(range.first, range.second); + ^~~~~~~~ +libdhcp++.cc:637:31: error: call to 'distance' is ambiguous + size_t num_defs = distance(range.first, range.second); + ^~~~~~~~ +libdhcp++.cc:743:35: error: call to 'distance' is ambiguous + size_t num_defs = distance(range.first, range.second); + ^~~~~~~~ +/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter = boost::multi_index::detail::hashed_index_iterator, std::__1::allocator > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array > >, boost::multi_index::detail::hashed_index_global_iterator_tag>] +distance(_InputIter __first, _InputIter __last) +^ +/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator = boost::multi_index::detail::hashed_index_iterator, std::__1::allocator > >, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::hashed_non_unique_tag>, boost::multi_index::detail::bucket_array > >, boost::multi_index::detail::hashed_index_global_iterator_tag>] + distance(SinglePassIterator first, SinglePassIterator last) + ^ + +--- src/lib/dhcp/libdhcp++.cc.orig 2017-10-05 13:00:05 UTC ++++ src/lib/dhcp/libdhcp++.cc +@@ -417,7 +417,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf + size_t num_defs = 0; + if (option_space == DHCP6_OPTION_SPACE) { + range = idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + // Standard option definitions do not include the definition for +@@ -425,7 +425,7 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf + // find the definition among runtime option definitions. + if (num_defs == 0) { + range = runtime_idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + OptionPtr opt; +@@ -534,7 +534,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf + size_t num_defs = 0; + if (option_space == DHCP4_OPTION_SPACE) { + range = idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + // Standard option definitions do not include the definition for +@@ -542,7 +542,7 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf + // find the definition among runtime option definitions. + if (num_defs == 0) { + range = runtime_idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + // Check if option unpacking must be deferred +@@ -634,7 +634,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t ve + idx->equal_range(opt_type); + // Get the number of returned option definitions for the + // option code. +- size_t num_defs = distance(range.first, range.second); ++ size_t num_defs = std::distance(range.first, range.second); + + if (num_defs > 1) { + // Multiple options of the same code are not supported +@@ -740,7 +740,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t ve + idx->equal_range(opt_type); + // Get the number of returned option definitions for + // the option code. +- size_t num_defs = distance(range.first, range.second); ++ size_t num_defs = std::distance(range.first, range.second); + + if (num_defs > 1) { + // Multiple options of the same code are not