svn commit: r431411 - head/textproc/libxml++26/files

[Jan Beich]

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<char>') 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<char>') 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<char>') 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_);
+   }
+ }