ports/69827: fam does not compile on post gcc-3.4.2 -CURRENT

[Michael Nottebrock]

>Number:         69827
>Category:       ports
>Synopsis:       fam does not compile on post gcc-3.4.2 -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 30 21:00:42 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Nottebrock
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD kiste 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Jun 25 07:31:27 CEST 2004 root at kiste:/usr/obj/usr/src/sys/KISTE-UP i386


	
>Description:
	Fam does not compile with FreeBSD-CURRENT's new system compiler due
	to bad C++ code. Previous versions displayed warnings, now the warnings
	have become errors.
>How-To-Repeat:
	
>Fix:

--- fam.diff begins here ---
Index: files/patch-fam-SmallTable.h
===================================================================
RCS file: files/patch-fam-SmallTable.h
diff -N files/patch-fam-SmallTable.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-fam-SmallTable.h	30 Jul 2004 19:01:46 -0000
@@ -0,0 +1,11 @@
+--- fam/SmallTable.h.orig	Fri Jul 30 20:55:12 2004
++++ fam/SmallTable.h	Fri Jul 30 20:55:50 2004
+@@ -98,7 +98,7 @@
+ }
+ 
+ template <class Tkey, class Tvalue>
+-SmallTable<Tkey, Tvalue>::Closure
++typename SmallTable<Tkey, Tvalue>::Closure
+ SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
+ {
+     unsigned l = 0, r = n;
Index: files/patch-include-BTree.h
===================================================================
RCS file: files/patch-include-BTree.h
diff -N files/patch-include-BTree.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-include-BTree.h	30 Jul 2004 19:01:46 -0000
@@ -0,0 +1,56 @@
+--- include/BTree.h.orig	Fri Jul 30 20:51:28 2004
++++ include/BTree.h	Fri Jul 30 20:52:49 2004
+@@ -236,7 +236,7 @@
+ //  to the right and returns them.
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::Node::remove(unsigned j)
+ {
+     Key k = key[j];
+@@ -348,7 +348,7 @@
+ }
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::Node::next(const Key& pred) const
+ {
+     if (!this)
+@@ -404,7 +404,7 @@
+ //  nodes as necessary on the way back.
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
+ {
+     if (!p) return Closure(key, value, NULL);
+@@ -499,7 +499,7 @@
+ //  Returns UNDER if node p is too small afterward, OK otherwise.
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Status
++typename BTree<Key, Value>::Status
+ BTree<Key, Value>::underflow(Node *p, unsigned i)
+ {
+     assert(p);
+@@ -557,7 +557,7 @@
+ 
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Closure
++typename BTree<Key, Value>::Closure
+ BTree<Key, Value>::remove_rightmost(Node *p)
+ {
+     int i = p->n;
+@@ -587,7 +587,7 @@
+ //  back up.
+ 
+ template <class Key, class Value>
+-BTree<Key, Value>::Status
++typename BTree<Key, Value>::Status
+ BTree<Key, Value>::remove(Node *p, const Key& key)
+ {
+     if (!p)
--- fam.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: