From owner-svn-ports-all@freebsd.org Sun Jan 21 10:08:42 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10C7EEC441F; Sun, 21 Jan 2018 10:08:42 +0000 (UTC) (envelope-from antoine@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 DD76AFDF; Sun, 21 Jan 2018 10:08:41 +0000 (UTC) (envelope-from antoine@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 1B2B01FF7; Sun, 21 Jan 2018 10:08:41 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0LA8eHr042335; Sun, 21 Jan 2018 10:08:40 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0LA8ewU042334; Sun, 21 Jan 2018 10:08:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201801211008.w0LA8ewU042334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 21 Jan 2018 10:08:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459583 - head/japanese/zinnia/files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: head/japanese/zinnia/files X-SVN-Commit-Revision: 459583 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.25 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: Sun, 21 Jan 2018 10:08:42 -0000 Author: antoine Date: Sun Jan 21 10:08:40 2018 New Revision: 459583 URL: https://svnweb.freebsd.org/changeset/ports/459583 Log: Fix build with clang 6 trainer.cpp:106:18: error: no matching function for call to 'make_pair' x_.push_back(std::make_pair(y, fn)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 224669 Reported by: pkg-fallout Added: head/japanese/zinnia/files/ head/japanese/zinnia/files/patch-trainer.cpp (contents, props changed) Added: head/japanese/zinnia/files/patch-trainer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/zinnia/files/patch-trainer.cpp Sun Jan 21 10:08:40 2018 (r459583) @@ -0,0 +1,20 @@ +--- trainer.cpp.orig 2010-05-09 05:34:08 UTC ++++ trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } +