From owner-svn-ports-all@freebsd.org Fri Jan 13 18:23:40 2017 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 94A62CAEC81; Fri, 13 Jan 2017 18:23:40 +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 mx1.freebsd.org (Postfix) with ESMTPS id 4C9291A98; Fri, 13 Jan 2017 18:23:40 +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 v0DINdrp097642; Fri, 13 Jan 2017 18:23:39 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0DINdTP097639; Fri, 13 Jan 2017 18:23:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701131823.v0DINdTP097639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 13 Jan 2017 18:23:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431411 - head/textproc/libxml++26/files X-SVN-Group: ports-head 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.23 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: Fri, 13 Jan 2017 18:23:40 -0000 Author: jbeich Date: Fri Jan 13 18:23:39 2017 New Revision: 431411 URL: https://svnweb.freebsd.org/changeset/ports/431411 Log: textproc/libxml++26: unbreak build with libc++ 4.0 libxml++/io/istreamparserinputbuffer.cc:42:12: error: no viable conversion from returned value of type 'std::istream' (aka 'basic_istream') to function return type 'bool' return input_; ^~~~~~ libxml++/io/ostreamoutputbuffer.cc:32:12: error: no viable conversion from returned value of type 'std::ostream' (aka 'basic_ostream') to function return type 'bool' return output_; ^~~~~~~ libxml++/io/ostreamoutputbuffer.cc:39:12: error: no viable conversion from returned value of type 'std::ostream' (aka 'basic_ostream') to function return type 'bool' return output_; ^~~~~~~ PR: 216034 Regressed by: https://github.com/llvm-mirror/libcxx/commit/3a1b90a866b6 Submitted by: dim Approved by: portmgr blanket Added: head/textproc/libxml++26/files/ head/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc (contents, props changed) head/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc (contents, props changed) Added: head/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc Fri Jan 13 18:23:39 2017 (r431411) @@ -0,0 +1,10 @@ +--- libxml++/io/istreamparserinputbuffer.cc.orig 2010-12-15 10:41:27 UTC ++++ libxml++/io/istreamparserinputbuffer.cc +@@ -39,6 +39,6 @@ namespace xmlpp + + bool IStreamParserInputBuffer::do_close() + { +- return input_; ++ return bool(input_); + } + } Added: head/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc Fri Jan 13 18:23:39 2017 (r431411) @@ -0,0 +1,18 @@ +--- libxml++/io/ostreamoutputbuffer.cc.orig 2010-12-15 10:41:27 UTC ++++ libxml++/io/ostreamoutputbuffer.cc +@@ -29,13 +29,13 @@ namespace xmlpp + // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded. + if(output_) + output_.write(buffer, len); +- return output_; ++ return bool(output_); + } + + bool OStreamOutputBuffer::do_close() + { + if(output_) + output_.flush(); +- return output_; ++ return bool(output_); + } + }