From owner-svn-ports-all@freebsd.org Mon Jul 30 09:49:56 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 817F71050D27; Mon, 30 Jul 2018 09:49:56 +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 32F0490BB9; Mon, 30 Jul 2018 09:49:56 +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 1375822A3D; Mon, 30 Jul 2018 09:49:56 +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 w6U9ntwA034729; Mon, 30 Jul 2018 09:49:55 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6U9ntOp034727; Mon, 30 Jul 2018 09:49:55 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807300949.w6U9ntOp034727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 30 Jul 2018 09:49:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475877 - head/games/species/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/species/files X-SVN-Commit-Revision: 475877 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, 30 Jul 2018 09:49:56 -0000 Author: tobik Date: Mon Jul 30 09:49:55 2018 New Revision: 475877 URL: https://svnweb.freebsd.org/changeset/ports/475877 Log: games/species: Fix build on 12.0-CURRENT kingdom.cpp:149:19: error: assigning to 'bool' from incompatible type 'std::__1::fstream' (aka 'basic_fstream') _in_experiment = fs; ^~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/species-1.2d_1.log Added: head/games/species/files/patch-kingdom.cpp (contents, props changed) Added: head/games/species/files/patch-kingdom.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/species/files/patch-kingdom.cpp Mon Jul 30 09:49:55 2018 (r475877) @@ -0,0 +1,15 @@ +kingdom.cpp:149:19: error: assigning to 'bool' from incompatible type 'std::__1::fstream' (aka 'basic_fstream') + _in_experiment = fs; + ^~ + +--- kingdom.cpp.orig 2018-07-30 09:43:22 UTC ++++ kingdom.cpp +@@ -146,7 +146,7 @@ void CKingdom::load(const bool runnable) { + } + fs.clear(); + fs.open("species.dat",ios::in|ios::binary); // open data file +- _in_experiment = fs; ++ _in_experiment = fs.is_open(); + if(!_in_experiment) { // couldn't open it? + if(verbose) { + cout << "species.dat failed; trying species.ini" << endl;