diff options
| -rw-r--r-- | src/goto.h | 2 | ||||
| -rw-r--r-- | src/help.h | 2 | ||||
| -rw-r--r-- | src/qregisters.cpp | 2 | ||||
| -rw-r--r-- | src/qregisters.h | 2 | ||||
| -rw-r--r-- | src/rbtree.h | 7 |
5 files changed, 10 insertions, 5 deletions
@@ -93,7 +93,7 @@ public: { Label *cur; - while ((cur = (Label *)min())) + while ((cur = (Label *)root())) delete (Label *)RBTreeString::remove(cur); } @@ -52,7 +52,7 @@ public: { Topic *cur; - while ((cur = (Topic *)min())) + while ((cur = (Topic *)root())) delete (Topic *)remove(cur); } diff --git a/src/qregisters.cpp b/src/qregisters.cpp index 821cbc2..80675be 100644 --- a/src/qregisters.cpp +++ b/src/qregisters.cpp @@ -854,7 +854,7 @@ QRegisterTable::clear(void) { QRegister *cur; - while ((cur = (QRegister *)min())) { + while ((cur = (QRegister *)root())) { if (cur == QRegisters::current) throw Error("Currently edited Q-Register \"%s\" " "cannot be discarded", cur->name); diff --git a/src/qregisters.h b/src/qregisters.h index cb50b6f..4648149 100644 --- a/src/qregisters.h +++ b/src/qregisters.h @@ -309,7 +309,7 @@ public: { QRegister *cur; - while ((cur = (QRegister *)min())) + while ((cur = (QRegister *)root())) delete (QRegister *)remove(cur); } diff --git a/src/rbtree.h b/src/rbtree.h index db0d430..131ba81 100644 --- a/src/rbtree.h +++ b/src/rbtree.h @@ -80,10 +80,15 @@ public: * means we can avoid declaring EBEntry implementations * virtual. */ - g_assert(min() == NULL); + g_assert(root() == NULL); } inline RBEntryType * + root(void) + { + return (RBEntryType *)RB_ROOT(&head); + } + inline RBEntryType * insert(RBEntryType *entry) { RB_INSERT(Tree, &head, entry); |