mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

67 lines
1.8 KiB

  1. --- fam-2.6.9/fam/SmallTable.h.orig 2004-05-13 17:21:00.615515152 +0200
  2. +++ fam-2.6.9/fam/SmallTable.h 2004-05-13 17:21:17.716915344 +0200
  3. @@ -98,7 +98,7 @@
  4. }
  5. template <class Tkey, class Tvalue>
  6. -SmallTable<Tkey, Tvalue>::Closure
  7. +typename SmallTable<Tkey, Tvalue>::Closure
  8. SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
  9. {
  10. unsigned l = 0, r = n;
  11. --- fam-2.6.9/include/BTree.h.orig 2004-05-13 17:16:35.937752288 +0200
  12. +++ fam-2.6.9/include/BTree.h 2004-05-13 17:20:24.740968912 +0200
  13. @@ -236,7 +236,7 @@
  14. // to the right and returns them.
  15. template <class Key, class Value>
  16. -BTree<Key, Value>::Closure
  17. +typename BTree<Key, Value>::Closure
  18. BTree<Key, Value>::Node::remove(unsigned j)
  19. {
  20. Key k = key[j];
  21. @@ -348,7 +348,7 @@
  22. }
  23. template <class Key, class Value>
  24. -BTree<Key, Value>::Closure
  25. +typename BTree<Key, Value>::Closure
  26. BTree<Key, Value>::Node::next(const Key& pred) const
  27. {
  28. if (!this)
  29. @@ -404,7 +404,7 @@
  30. // nodes as necessary on the way back.
  31. template <class Key, class Value>
  32. -BTree<Key, Value>::Closure
  33. +typename BTree<Key, Value>::Closure
  34. BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
  35. {
  36. if (!p) return Closure(key, value, NULL);
  37. @@ -499,7 +499,7 @@
  38. // Returns UNDER if node p is too small afterward, OK otherwise.
  39. template <class Key, class Value>
  40. -BTree<Key, Value>::Status
  41. +typename BTree<Key, Value>::Status
  42. BTree<Key, Value>::underflow(Node *p, unsigned i)
  43. {
  44. assert(p);
  45. @@ -557,7 +557,7 @@
  46. template <class Key, class Value>
  47. -BTree<Key, Value>::Closure
  48. +typename BTree<Key, Value>::Closure
  49. BTree<Key, Value>::remove_rightmost(Node *p)
  50. {
  51. int i = p->n;
  52. @@ -587,7 +587,7 @@
  53. // back up.
  54. template <class Key, class Value>
  55. -BTree<Key, Value>::Status
  56. +typename BTree<Key, Value>::Status
  57. BTree<Key, Value>::remove(Node *p, const Key& key)
  58. {
  59. if (!p)