Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 29 Apr 2015 03:20:26 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r384954 - head/math/abacus/files
Message-ID:  <201504290320.t3T3KQZI005384@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Wed Apr 29 03:20:25 2015
New Revision: 384954
URL: https://svnweb.freebsd.org/changeset/ports/384954

Log:
  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)

Added:
  head/math/abacus/files/patch-Include-abacus_ostream.h   (contents, props changed)

Added: head/math/abacus/files/patch-Include-abacus_ostream.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/abacus/files/patch-Include-abacus_ostream.h	Wed Apr 29 03:20:25 2015	(r384954)
@@ -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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504290320.t3T3KQZI005384>