From 1ac141b1f868580c627b4729e7a294aad2cbfa2f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 4 Mar 2007 09:02:12 +0000 Subject: [PATCH] Made RamFS code gcc4 friendly. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20323 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../userlandfs/r5/src/test/ramfs/AVLTree.h | 4 ++++ .../userlandfs/r5/src/test/ramfs/AreaUtils.cpp | 2 +- .../file_systems/userlandfs/r5/src/test/ramfs/List.h | 12 ++++++------ .../userlandfs/r5/src/test/ramfs/Locking.h | 2 +- .../userlandfs/r5/src/test/ramfs/NodeChildTable.h | 2 +- .../userlandfs/r5/src/test/ramfs/Query.cpp | 6 +++--- .../userlandfs/r5/src/test/ramfs/TwoKeyAVLTree.h | 6 ++++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AVLTree.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AVLTree.h index 60e11bae48..247bff7a95 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AVLTree.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AVLTree.h @@ -30,10 +30,14 @@ #include +#include + #include #include "Misc.h" +using std::nothrow; + // maximal height of a tree static const int kMaxAVLTreeHeight = 32; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AreaUtils.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AreaUtils.cpp index 4af567880f..5c95dda09b 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AreaUtils.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/AreaUtils.cpp @@ -25,11 +25,11 @@ // dealings in this Software without prior written authorization of the // copyright holder. -#include #include #include "AreaUtils.h" #include "Debug.h" +#include "Misc.h" #ifndef USE_STANDARD_FUNCTIONS #define USE_STANDARD_FUNCTIONS 0 diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/List.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/List.h index 21aeb87533..710ea25c70 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/List.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/List.h @@ -101,7 +101,7 @@ private: // sDefaultItem template -List::item_t +typename List::item_t List::sDefaultItem( DEFAULT_ITEM_SUPPLIER::GetItem()); @@ -129,7 +129,7 @@ List::~List() // GetDefaultItem template inline -const List::item_t & +const typename List::item_t & List::GetDefaultItem() const { return sDefaultItem; @@ -138,7 +138,7 @@ List::GetDefaultItem() const // GetDefaultItem template inline -List::item_t & +typename List::item_t & List::GetDefaultItem() { return sDefaultItem; @@ -310,7 +310,7 @@ List::IsEmpty() const // ItemAt template -const List::item_t & +const typename List::item_t & List::ItemAt(int32 index) const { if (index >= 0 && index < fItemCount) @@ -320,7 +320,7 @@ List::ItemAt(int32 index) const // ItemAt template -List::item_t & +typename List::item_t & List::ItemAt(int32 index) { if (index >= 0 && index < fItemCount) @@ -330,7 +330,7 @@ List::ItemAt(int32 index) // Items template -const List::item_t * +const typename List::item_t * List::Items() const { return fItems; diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Locking.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Locking.h index e0253774b6..5831719a34 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Locking.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Locking.h @@ -11,4 +11,4 @@ class Volume; typedef AutoLocker > VolumeReadLocker; typedef AutoLocker > VolumeWriteLocker; -#endif LOCKING_H +#endif // LOCKING_H diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/NodeChildTable.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/NodeChildTable.h index e129948431..a350f6a2c0 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/NodeChildTable.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/NodeChildTable.h @@ -224,7 +224,7 @@ NodeChildTable::GetNodeChild(vnode_id id, // _FindElement template -NodeChildTable::Element * +typename NodeChildTable::Element * NodeChildTable::_FindElement(vnode_id id, const char *name) const { diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Query.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Query.cpp index 0acde066c6..9818255263 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Query.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Query.cpp @@ -1449,13 +1449,13 @@ Expression::ParseEquation(char **expr) { skipWhitespace(expr); - bool not = false; + bool nott = false; // note: not is a C++ keyword if (**expr == '!') { skipWhitespace(expr, 1); if (**expr != '(') return NULL; - not = true; + nott = true; } if (**expr == ')') { @@ -1475,7 +1475,7 @@ Expression::ParseEquation(char **expr) // If the term is negated, we just complement the tree, to get // rid of the not, a.k.a. DeMorgan's Law. - if (not) + if (nott) term->Complement(); skipWhitespace(expr, 1); diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/TwoKeyAVLTree.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/TwoKeyAVLTree.h index 0407e37561..94676c19f4 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/TwoKeyAVLTree.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/TwoKeyAVLTree.h @@ -141,6 +141,8 @@ private: GetKey; typedef AVLTree BaseClass; +public: + typedef typename BaseClass::Iterator Iterator; public: TwoKeyAVLTree(); @@ -210,7 +212,7 @@ Value * TWO_KEY_AVL_TREE_CLASS_NAME::FindFirst(const PrimaryKey &key, Iterator *iterator) { - Node *node = fRoot; + Node *node = BaseClass::fRoot; while (node) { int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(fGetValue(node))); if (cmp == 0) { @@ -237,7 +239,7 @@ Value * TWO_KEY_AVL_TREE_CLASS_NAME::FindLast(const PrimaryKey &key, Iterator *iterator) { - Node *node = fRoot; + Node *node = BaseClass::fRoot; while (node) { int cmp = fPrimaryKeyCompare(key, fGetPrimaryKey(fGetValue(node))); if (cmp == 0) {