projects / packages / fam.git / blame
| Commit | Line | Data |
|---|---|---|
| 216ddd1d PS |
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 | |
| 4 | @@ -37,7 +37,7 @@ | |
| 5 | #include "Interest.h" | |
| 6 | #include "Log.h" | |
| 7 | #include "Scheduler.h" | |
| 8 | -#include "alloc.h" | |
| 9 | +#include <malloc.h> | |
| 10 | ||
| 11 | ||
| 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 | |
| 16 | @@ -42,7 +42,7 @@ | |
| 17 | #include "Interest.h" | |
| 18 | #include "Log.h" | |
| 19 | #include "Scheduler.h" | |
| 20 | -#include "alloc.h" | |
| 21 | +#include <malloc.h> | |
| 22 | ||
| 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 | |
| 28 | @@ -98,7 +98,7 @@ | |
| 29 | } | |
| 30 | ||
| 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 | |
| 35 | { | |
| 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 | |
| 40 | @@ -236,7 +236,7 @@ | |
| 41 | // to the right and returns them. | |
| 42 | ||
| 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) | |
| 47 | { | |
| 48 | Key k = key[j]; | |
| 49 | @@ -348,7 +348,7 @@ | |
| 50 | } | |
| 51 | ||
| 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 | |
| 56 | { | |
| 57 | if (!this) | |
| 58 | @@ -404,7 +404,7 @@ | |
| 59 | // nodes as necessary on the way back. | |
| 60 | ||
| 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) | |
| 65 | { | |
| 66 | if (!p) return Closure(key, value, 0); | |
| 67 | @@ -499,7 +499,7 @@ | |
| 68 | // Returns UNDER if node p is too small afterward, OK otherwise. | |
| 69 | ||
| 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) | |
| 74 | { | |
| 75 | assert(p); | |
| 76 | @@ -557,7 +557,7 @@ | |
| 77 | ||
| 78 | ||
| 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) | |
| 83 | { | |
| 84 | int i = p->n; | |
| 85 | @@ -587,7 +587,7 @@ | |
| 86 | // back up. | |
| 87 | ||
| 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) | |
| 92 | { | |
| 93 | if (!p) | |
| 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 | |
| 97 | @@ -34,7 +34,8 @@ | |
| 98 | #include <syslog.h> | |
| 99 | #include <errno.h> | |
| 100 | ||
| 101 | -#include <iostream.h> | |
| 102 | +#include <iostream> | |
| 103 | +using namespace std; | |
| 104 | ||
| 105 | #include "fam.h" | |
| 106 | #include "Client.h" |