aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-04-29 11:20:25 +0800
committerjbeich <jbeich@FreeBSD.org>2015-04-29 11:20:25 +0800
commitbfc8f91ee13334ae65874495862c8ff697b0e585 (patch)
tree2b62ee19915d31bc2c64f4d20077c611481a5dcb
parent8bf94b805835502ec874f667fe70d9265d7c617f (diff)
downloadfreebsd-ports-gnome-bfc8f91ee13334ae65874495862c8ff697b0e585.tar.gz
freebsd-ports-gnome-bfc8f91ee13334ae65874495862c8ff697b0e585.tar.zst
freebsd-ports-gnome-bfc8f91ee13334ae65874495862c8ff697b0e585.zip
math/abacus: unbreak build on 10.1R (clang 3.4.1)
sources/ostream.cc:290:16: error: declaration conflicts with target of using declaration already in scope ABA_OSTREAM& endl(ABA_OSTREAM &o) ^ ./Include/abacus/ostream.h:48:14: note: target of using declaration ABA_OSTREAM& endl(ABA_OSTREAM &o); ^ ./Include/abacus/ostream.h:50:9: note: using declaration using ::endl; ^ sources/ostream.cc:293:11: error: 'on_' is a private member of 'ABA_OSTREAM' if (o.on_) o.out_ << flush; ^ ./Include/abacus/ostream.h:225:17: note: declared private here bool on_; ^ sources/ostream.cc:293:18: error: 'out_' is a private member of 'ABA_OSTREAM' if (o.on_) o.out_ << flush; ^ ./Include/abacus/ostream.h:220:17: note: declared private here ostream &out_; ^ sources/ostream.cc:294:10: error: 'logOn_' is a private member of 'ABA_OSTREAM' if(o.logOn_) *(o.log_) << flush; ^ ./Include/abacus/ostream.h:230:17: note: declared private here bool logOn_; ^ sources/ostream.cc:294:22: error: 'log_' is a private member of 'ABA_OSTREAM' if(o.logOn_) *(o.log_) << flush; ^ ./Include/abacus/ostream.h:234:17: note: declared private here ofstream *log_; ^ Tested by: md5 ostream.o (gcc5, clang36)
-rw-r--r--math/abacus/files/patch-Include-abacus_ostream.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/math/abacus/files/patch-Include-abacus_ostream.h b/math/abacus/files/patch-Include-abacus_ostream.h
new file mode 100644
index 000000000000..d7d0168cb45a
--- /dev/null
+++ b/math/abacus/files/patch-Include-abacus_ostream.h
@@ -0,0 +1,11 @@
+--- Include/abacus/ostream.h.orig 2010-11-19 15:47:57 UTC
++++ Include/abacus/ostream.h
+@@ -47,7 +47,7 @@ using namespace std;
+ class ABA_OSTREAM;
+ ABA_OSTREAM& endl(ABA_OSTREAM &o);
+ ABA_OSTREAM& flush(ABA_OSTREAM &o);
+-using ::endl;
++using std::endl;
+
+ #include "abacus/abacusroot.h"
+ class ABA_STRING;