1 diff -uNr fam-2.6.10.orig/fam/DNotify.c++ fam-2.6.10/fam/DNotify.c++
2 --- fam-2.6.10.orig/fam/DNotify.c++ 2004-02-17 12:56:54.000000000 +0100
3 +++ fam-2.6.10/fam/DNotify.c++ 2004-02-17 13:00:18.321654784 +0100
12 int DNotify::pipe_write_fd = -2;
13 diff -uNr fam-2.6.10.orig/fam/IMon.c++ fam-2.6.10/fam/IMon.c++
14 --- fam-2.6.10.orig/fam/IMon.c++ 2003-04-15 06:21:31.000000000 +0200
15 +++ fam-2.6.10/fam/IMon.c++ 2004-02-17 12:59:53.667402800 +0100
19 #include "Scheduler.h"
23 int IMon::imonfd = -2;
24 IMon::EventHandler IMon::ehandler = NULL;
25 diff -uNr fam-2.6.10.orig/fam/SmallTable.h fam-2.6.10/fam/SmallTable.h
26 --- fam-2.6.10.orig/fam/SmallTable.h 2003-04-15 06:21:43.000000000 +0200
27 +++ fam-2.6.10/fam/SmallTable.h 2004-02-17 12:56:54.985566568 +0100
31 template <class Tkey, class Tvalue>
32 -SmallTable<Tkey, Tvalue>::Closure
33 +typename SmallTable<Tkey, Tvalue>::Closure
34 SmallTable<Tkey, Tvalue>::position(const Tkey& key) const
36 unsigned l = 0, r = n;
37 diff -uNr fam-2.6.10.orig/include/BTree.h fam-2.6.10/include/BTree.h
38 --- fam-2.6.10.orig/include/BTree.h 2004-02-17 13:02:07.000000000 +0100
39 +++ fam-2.6.10/include/BTree.h 2004-02-17 12:56:54.986566416 +0100
41 // to the right and returns them.
43 template <class Key, class Value>
44 -BTree<Key, Value>::Closure
45 +typename BTree<Key, Value>::Closure
46 BTree<Key, Value>::Node::remove(unsigned j)
52 template <class Key, class Value>
53 -BTree<Key, Value>::Closure
54 +typename BTree<Key, Value>::Closure
55 BTree<Key, Value>::Node::next(const Key& pred) const
59 // nodes as necessary on the way back.
61 template <class Key, class Value>
62 -BTree<Key, Value>::Closure
63 +typename BTree<Key, Value>::Closure
64 BTree<Key, Value>::insert(Node *p, const Key& key, const Value& value)
66 if (!p) return Closure(key, value, 0);
68 // Returns UNDER if node p is too small afterward, OK otherwise.
70 template <class Key, class Value>
71 -BTree<Key, Value>::Status
72 +typename BTree<Key, Value>::Status
73 BTree<Key, Value>::underflow(Node *p, unsigned i)
79 template <class Key, class Value>
80 -BTree<Key, Value>::Closure
81 +typename BTree<Key, Value>::Closure
82 BTree<Key, Value>::remove_rightmost(Node *p)
88 template <class Key, class Value>
89 -BTree<Key, Value>::Status
90 +typename BTree<Key, Value>::Status
91 BTree<Key, Value>::remove(Node *p, const Key& key)
94 diff -uNr fam-2.6.10.orig/libfam/Client.c++ fam-2.6.10/libfam/Client.c++
95 --- fam-2.6.10.orig/libfam/Client.c++ 2003-04-15 06:21:25.000000000 +0200
96 +++ fam-2.6.10/libfam/Client.c++ 2004-02-17 12:56:54.987566264 +0100
101 -#include <iostream.h>
103 +using namespace std;