From owner-svn-ports-all@freebsd.org Sat Sep 1 10:29:12 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 29004FE9057; Sat, 1 Sep 2018 10:29:12 +0000 (UTC) (envelope-from tobik@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 D2BA58424E; Sat, 1 Sep 2018 10:29:11 +0000 (UTC) (envelope-from tobik@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 CDAF9DF1; Sat, 1 Sep 2018 10:29:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w81ATBD6053789; Sat, 1 Sep 2018 10:29:11 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w81ATBJp053788; Sat, 1 Sep 2018 10:29:11 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809011029.w81ATBJp053788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 1 Sep 2018 10:29:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478668 - head/science/crf++/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/science/crf++/files X-SVN-Commit-Revision: 478668 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: Sat, 01 Sep 2018 10:29:12 -0000 Author: tobik Date: Sat Sep 1 10:29:11 2018 New Revision: 478668 URL: https://svnweb.freebsd.org/changeset/ports/478668 Log: science/crf++: Fix build with Clang 6 feature_index.cpp:174:22: error: no matching function for call to 'make_pair' old2new.insert(std::make_pair(it->second.first, new_maxid)); ^~~~~~~~~~~~~~~~~~~~~~~~ http://beefy11.nyi.freebsd.org/data/head-i386-default/p478276_s338342/logs/errors/crf++-0.54_1.log Added: head/science/crf++/files/ head/science/crf++/files/patch-feature__index.cpp (contents, props changed) Added: head/science/crf++/files/patch-feature__index.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/crf++/files/patch-feature__index.cpp Sat Sep 1 10:29:11 2018 (r478668) @@ -0,0 +1,21 @@ +--- feature_index.cpp.orig 2018-09-01 10:26:57 UTC ++++ feature_index.cpp +@@ -34,8 +34,7 @@ int EncoderFeatureIndex::getID(const char *key) { + std::map >::iterator + it = dic_.find(key); + if (it == dic_.end()) { +- dic_.insert(std::make_pair > +- (key, std::make_pair(maxid_, 1))); ++ dic_.insert(std::make_pair(key, std::make_pair(maxid_, 1))); + int n = maxid_; + maxid_ += (key[0] == 'U' ? y_.size() : y_.size() * y_.size()); + return n; +@@ -171,7 +170,7 @@ void EncoderFeatureIndex::shrink(size_t freq) { + const std::string &key = it->first; + + if (it->second.second >= freq) { +- old2new.insert(std::make_pair(it->second.first, new_maxid)); ++ old2new.insert(std::make_pair(it->second.first, new_maxid)); + it->second.first = new_maxid; + new_maxid += (key[0] == 'U' ? y_.size() : y_.size() * y_.size()); + ++it;