cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

math/abacus: unbreak build on 10.1R (clang 3.4.1)

Browse Source 
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)
This commit is contained in:
Jan Beich 2015-04-29 03:20:25 +00:00
parent 690e66bf69
commit 2991409ad5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=384954
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
math/abacus/files/patch-Include-abacus_ostream.h Normal file
View File

@ -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;