Hi, in an effort towards upgrading lang/gcc to gcc 4.7, I'm helping gerald@ in making ports gcc47-safe. Please consider the following patch to your port. If you approve of the patch, gerald@ has offered his help in commiting it. If you're commiting yourself or have someone else commit this (or another patch to the same effect), can you please add an additional reference to ports/183342 in the commit message? In my test environment, the port built successfully with lang/gcc47. Fix: GCC 4.7 needs an explicit this-> on calls to member functions. # fix calls to member functions $ svn status A files/patch-Include-standardpool.inc Regards, Christoph--UWCvBdROw5nE1f6EtVrewhKL3IFeLhQB9sB0lf7xy3GJTOqZ Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: files/patch-Include-standardpool.inc =================================================================== --- files/patch-Include-standardpool.inc (revision 0) +++ files/patch-Include-standardpool.inc (working copy) @@ -0,0 +1,20 @@ +--- Include/abacus/standardpool.inc.orig 2013-11-16 14:06:39.000000000 +0100 ++++ Include/abacus/standardpool.inc 2013-11-16 14:08:30.000000000 +0100 +@@ -129,7 +129,7 @@ + + for(int i = 0; i < ABA_POOL<BaseType, CoType>::number(); i++) + { +- if(softDeleteConVar(pool_[i]) == 0) ++ if(this->softDeleteConVar(pool_[i]) == 0) + { + nDeleted++; + // consider the case that a slot has been deleted although it was empty +@@ -179,7 +179,7 @@ + + while(nRemoved < maxRemove && !candidates.empty()) { + c = candidates.extractMin(); +- hardDeleteConVar(pool_[c]); ++ this->hardDeleteConVar(pool_[c]); + nRemoved++; + } +
Responsible Changed From-To: freebsd-ports-bugs->gahr Over to maintainer (via the GNATS Auto Assign Tool)
Apologies, the PR to reference should have been 182136. Gerald
Approved, thanks! -- Pietro Cerutti The FreeBSD Project gahr@FreeBSD.org PGP Public Key: http://gahr.ch/pgp
Author: mat Date: Tue Jan 7 22:50:47 2014 New Revision: 339044 URL: http://svnweb.freebsd.org/changeset/ports/339044 Log: Fix build with gcc47. PR: ports/184571 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Added: head/math/abacus/files/patch-Include-standardpool.inc (contents, props changed) Added: head/math/abacus/files/patch-Include-standardpool.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/abacus/files/patch-Include-standardpool.inc Tue Jan 7 22:50:47 2014 (r339044) @@ -0,0 +1,20 @@ +--- Include/abacus/standardpool.inc.orig 2013-11-16 14:06:39.000000000 +0100 ++++ Include/abacus/standardpool.inc 2013-11-16 14:08:30.000000000 +0100 +@@ -129,7 +129,7 @@ + + for(int i = 0; i < ABA_POOL<BaseType, CoType>::number(); i++) + { +- if(softDeleteConVar(pool_[i]) == 0) ++ if(this->softDeleteConVar(pool_[i]) == 0) + { + nDeleted++; + // consider the case that a slot has been deleted although it was empty +@@ -179,7 +179,7 @@ + + while(nRemoved < maxRemove && !candidates.empty()) { + c = candidates.extractMin(); +- hardDeleteConVar(pool_[c]); ++ this->hardDeleteConVar(pool_[c]); + nRemoved++; + } + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!
Author: mat Date: Tue Jan 7 23:22:58 2014 New Revision: 339049 URL: http://svnweb.freebsd.org/changeset/ports/339049 Log: MFH: r339044 Fix build with gcc47. PR: ports/184571 Submitted by: Christoph Moench-Tegeder Approved by: maintainer Approved by: portmgr (implicit) Added: branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc - copied unchanged from r339044, head/math/abacus/files/patch-Include-standardpool.inc Modified: Directory Properties: branches/2014Q1/ (props changed) Copied: branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc (from r339044, head/math/abacus/files/patch-Include-standardpool.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/math/abacus/files/patch-Include-standardpool.inc Tue Jan 7 23:22:58 2014 (r339049, copy of r339044, head/math/abacus/files/patch-Include-standardpool.inc) @@ -0,0 +1,20 @@ +--- Include/abacus/standardpool.inc.orig 2013-11-16 14:06:39.000000000 +0100 ++++ Include/abacus/standardpool.inc 2013-11-16 14:08:30.000000000 +0100 +@@ -129,7 +129,7 @@ + + for(int i = 0; i < ABA_POOL<BaseType, CoType>::number(); i++) + { +- if(softDeleteConVar(pool_[i]) == 0) ++ if(this->softDeleteConVar(pool_[i]) == 0) + { + nDeleted++; + // consider the case that a slot has been deleted although it was empty +@@ -179,7 +179,7 @@ + + while(nRemoved < maxRemove && !candidates.empty()) { + c = candidates.extractMin(); +- hardDeleteConVar(pool_[c]); ++ this->hardDeleteConVar(pool_[c]); + nRemoved++; + } + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"