From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 19 15:30:17 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D21DE16A4CF for ; Thu, 19 Aug 2004 15:30:17 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDD9343D53 for ; Thu, 19 Aug 2004 15:30:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7JFUEkt019566 for ; Thu, 19 Aug 2004 15:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7JFUEuT019563; Thu, 19 Aug 2004 15:30:14 GMT (envelope-from gnats) Resent-Date: Thu, 19 Aug 2004 15:30:14 GMT Resent-Message-Id: <200408191530.i7JFUEuT019563@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Guido Falsi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C2BD16A4CE for ; Thu, 19 Aug 2004 15:23:33 +0000 (GMT) Received: from mail.dada.it (mail2.dada.it [195.110.100.2]) by mx1.FreeBSD.org (Postfix) with SMTP id 4392543D39 for ; Thu, 19 Aug 2004 15:23:32 +0000 (GMT) (envelope-from mad@madpilot.net) Received: (qmail 1937 invoked from network); 19 Aug 2004 15:23:28 -0000 Received: from unknown (HELO madpilot.net) (195.110.114.197) by mail.dada.it with SMTP; 19 Aug 2004 15:23:28 -0000 Received: (qmail 57301 invoked from network); 19 Aug 2004 15:23:30 -0000 Received: from wedge.madpilot.net (192.168.13.11) by 0 with SMTP; 19 Aug 2004 15:23:30 -0000 Received: from wedge.madpilot.net (localhost.madpilot.net [127.0.0.1]) by wedge.madpilot.net (8.13.1/8.12.11) with ESMTP id i7JFNTO2010208 for ; Thu, 19 Aug 2004 17:23:29 +0200 (CEST) (envelope-from mad@wedge.madpilot.net) Received: (from mad@localhost) by wedge.madpilot.net (8.13.1/8.12.11/Submit) id i7JFNTYS010207; Thu, 19 Aug 2004 17:23:29 +0200 (CEST) (envelope-from mad) Message-Id: <200408191523.i7JFNTYS010207@wedge.madpilot.net> Date: Thu, 19 Aug 2004 17:23:29 +0200 (CEST) From: Guido Falsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70664: [maintainer update] games/netpanzer: fix build with gcc 3.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Guido Falsi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2004 15:30:18 -0000 >Number: 70664 >Category: ports >Synopsis: [maintainer update] games/netpanzer: fix build with gcc 3.4 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 19 15:30:14 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 5.2-CURRENT i386 >Organization: none >Environment: System: FreeBSD wedge.madpilot.net 5.2-CURRENT FreeBSD 5.2-CURRENT #5: Sun Aug 15 19:43:15 CEST 2004 root@wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386 >Description: Fix build with new gcc 3.4 on -current. added 2 new patch files: files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp >How-To-Repeat: >Fix: diff -ruN netpanzer.old/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp --- netpanzer.old/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp Thu Jan 1 01:00:00 1970 +++ netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp Thu Aug 19 16:40:48 2004 @@ -0,0 +1,11 @@ +--- src/Lib/ArrayUtil/LinkListDoubleTemplate.hpp.orig Tue Dec 2 12:40:14 2003 ++++ src/Lib/ArrayUtil/LinkListDoubleTemplate.hpp Thu Aug 19 16:34:25 2004 +@@ -203,7 +203,7 @@ + object->prev->next = before; + } + +- if(delete_ptr == front) { ++ if(object == front) { + front = before; + } + diff -ruN netpanzer.old/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp --- netpanzer.old/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp Thu Jan 1 01:00:00 1970 +++ netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp Thu Aug 19 17:06:03 2004 @@ -0,0 +1,66 @@ +--- src/Lib/ArrayUtil/QueueTemplate.hpp.orig Sun Dec 21 01:48:03 2003 ++++ src/Lib/ArrayUtil/QueueTemplate.hpp Thu Aug 19 16:34:31 2004 +@@ -42,8 +42,8 @@ + + bool enqueue(const TYPE& object ) + { +- add( object, (rear + 1) % size ); +- rear = (rear + 1) % size; ++ add( object, (rear + 1) % this->size ); ++ rear = (rear + 1) % this->size; + + if ( front == rear ) + return( false ); +@@ -55,29 +55,29 @@ + { + assert( front != rear ); + +- front = ( front + 1 ) % size; +- return( array[ front ] ); ++ front = ( front + 1 ) % this->size; ++ return( this->array[ front ] ); + } + + void pop() + { + assert( front != rear ); + +- front = ( front + 1 ) % size; ++ front = ( front + 1 ) % this->size; + } + + TYPE getFirst() + { + assert( front != rear ); + +- return( array[ (( front + 1 ) % size) ] ); ++ return( this->array[ (( front + 1 ) % this->size) ] ); + } + + TYPE * getFirstPtr() + { + assert( front != rear ); + +- return( &(array[ (( front + 1 ) % size) ]) ); ++ return( &(this->array[ (( front + 1 ) % this->size) ]) ); + } + + +@@ -88,7 +88,7 @@ + + bool isFull () const + { +- return front == (rear + 1) % size; ++ return front == (rear + 1) % this->size; + } + + bool isReady() const +@@ -99,7 +99,7 @@ + unsigned long itemCount() const + { + if ( front > rear ) +- return ( (rear+1) + ( (size-1) - front ) ); ++ return ( (rear+1) + ( (this->size-1) - front ) ); + else + return ( rear - front ); + } >Release-Note: >Audit-Trail: >Unformatted: