@ -1,67 +0,0 @@ |
|||||
--- fam-2.6.9/fam/SmallTable.h.orig 2004-05-13 17:21:00.615515152 +0200
|
|
||||
+++ fam-2.6.9/fam/SmallTable.h 2004-05-13 17:21:17.716915344 +0200
|
|
||||
@@ -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; |
|
||||
--- fam-2.6.9/include/BTree.h.orig 2004-05-13 17:16:35.937752288 +0200
|
|
||||
+++ fam-2.6.9/include/BTree.h 2004-05-13 17:20:24.740968912 +0200
|
|
||||
@@ -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) |
|