summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-01-13 18:23:39 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-01-13 18:23:39 +0000
commita71898a3f3b462fb438e97c5136f459427a52a25 (patch)
tree790346c198dcd14f64a61cef3b58b504b95876fb
parentwww/mod_http2-devel: Update to 1.8.8 (diff)
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
-rw-r--r--textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc10
-rw-r--r--textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc18
2 files changed, 28 insertions, 0 deletions
diff --git a/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc b/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc
new file mode 100644
index 000000000000..109e1e543470
--- /dev/null
+++ b/textproc/libxml++26/files/patch-libxml++_io_istreamparserinputbuffer.cc
@@ -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_);
+ }
+ }
diff --git a/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc b/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc
new file mode 100644
index 000000000000..666d10d74920
--- /dev/null
+++ b/textproc/libxml++26/files/patch-libxml++_io_ostreamoutputbuffer.cc
@@ -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_);
+ }
+ }