Date: Thu, 19 Aug 2004 17:23:29 +0200 (CEST) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70664: [maintainer update] games/netpanzer: fix build with gcc 3.4 Message-ID: <200408191523.i7JFNTYS010207@wedge.madpilot.net> Resent-Message-ID: <200408191530.i7JFUEuT019563@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408191523.i7JFNTYS010207>