diff options
Diffstat (limited to 'net/irrtoolset-nox11/patches/patch-bj')
| -rw-r--r-- | net/irrtoolset-nox11/patches/patch-bj | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/net/irrtoolset-nox11/patches/patch-bj b/net/irrtoolset-nox11/patches/patch-bj index e78ffd80314..3716eafe562 100644 --- a/net/irrtoolset-nox11/patches/patch-bj +++ b/net/irrtoolset-nox11/patches/patch-bj @@ -1,7 +1,7 @@ -$NetBSD: patch-bj,v 1.1 2005/03/06 11:40:21 spz Exp $ +$NetBSD: patch-bj,v 1.2 2007/05/22 12:17:49 spz Exp $ ---- src/Core/util/Buffer.cc.orig 2004-07-30 12:58:10.000000000 +0200 -+++ src/Core/util/Buffer.cc +--- ./src/Core/util/Buffer.cc.orig 2006-10-09 18:05:14.000000000 +0200 ++++ ./src/Core/util/Buffer.cc @@ -36,7 +36,11 @@ #include <cassert> #include <iomanip> @@ -14,3 +14,15 @@ $NetBSD: patch-bj,v 1.1 2005/03/06 11:40:21 spz Exp $ using namespace std; +@@ -174,7 +178,10 @@ Buffer::uncompress() + + void Buffer::extend(unsigned long minExtend) { + assert(!callerAllocated); // !!! +- capacity = (capacity + BufferExtendIncrement) >? (size + minExtend); ++ // using deprecated g++ only operators is not that portable, ++ // use ordinary trigraph instead ++ capacity = ( (capacity + BufferExtendIncrement) > (size + minExtend) ) ? ++ (capacity + BufferExtendIncrement) : (size + minExtend); + contents = (char *)realloc(contents, capacity); + } + |