From aa46234e72f1c97c6573d682021d24c3aa178a1c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 4 Mar 2007 09:18:55 +0000 Subject: [PATCH] Made ReiserFS code gcc 4 friendly. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20324 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../userlandfs/r5/src/test/reiserfs/BlockCache.cpp | 4 ++++ .../userlandfs/r5/src/test/reiserfs/Item.h | 2 +- .../userlandfs/r5/src/test/reiserfs/Iterators.cpp | 6 +++--- .../userlandfs/r5/src/test/reiserfs/Key.h | 5 +++++ .../userlandfs/r5/src/test/reiserfs/List.h | 12 ++++++------ .../userlandfs/r5/src/test/reiserfs/Settings.cpp | 2 ++ .../userlandfs/r5/src/test/reiserfs/StatItem.h | 8 ++++---- .../userlandfs/r5/src/test/reiserfs/String.cpp | 2 ++ .../userlandfs/r5/src/test/reiserfs/SuperBlock.cpp | 2 ++ 9 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/BlockCache.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/BlockCache.cpp index f20782c1cb..0300927a80 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/BlockCache.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/BlockCache.cpp @@ -19,6 +19,8 @@ // You can alternatively use *this file* under the terms of the the MIT // license included in this package. +#include + #include #include #include @@ -32,6 +34,8 @@ #include "Debug.h" #include "reiserfs.h" +using std::nothrow; + /*! \class BlockCache \brief Implements a cache for disk blocks. diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Item.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Item.h index b1c9d99438..43e96f2ed4 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Item.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Item.h @@ -36,7 +36,7 @@ public: uint16 GetLen() const { return le2h(ih_item_len); } uint16 GetLocation() const { return le2h(ih_item_location); } uint16 GetVersion() const { return le2h(ih_version); } - const Key *GetKey() const { return static_cast(&ih_key); } + const Key *GetKey() const { return Key::CastFrom(&ih_key); } VKey *GetKey(VKey *k) const { k->SetTo(GetKey(), GetVersion()); return k; } // indirect item only diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Iterators.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Iterators.cpp index 6589e926eb..f0a76f7288 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Iterators.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Iterators.cpp @@ -313,7 +313,7 @@ TreeIterator::GoTo(uint32 direction) \return \c B_OK, if everything went fine */ status_t -TreeIterator::GoToPreviousLeaf(LeafNode **node = NULL) +TreeIterator::GoToPreviousLeaf(LeafNode **node) { status_t error = InitCheck(); if (error == B_OK) { @@ -355,7 +355,7 @@ TreeIterator::GoToPreviousLeaf(LeafNode **node = NULL) \return \c B_OK, if everything went fine */ status_t -TreeIterator::GoToNextLeaf(LeafNode **node = NULL) +TreeIterator::GoToNextLeaf(LeafNode **node) { status_t error = InitCheck(); if (error == B_OK) { @@ -392,7 +392,7 @@ TreeIterator::GoToNextLeaf(LeafNode **node = NULL) \return \c B_OK, if everything went fine. */ status_t -TreeIterator::FindRightMostLeaf(const VKey *k, LeafNode **node = NULL) +TreeIterator::FindRightMostLeaf(const VKey *k, LeafNode **node) { //printf("TreeIterator::FindRightMostLeaf()\n"); status_t error = (k ? InitCheck() : B_BAD_VALUE); diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Key.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Key.h index 7f4c5929a3..366dc70344 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Key.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Key.h @@ -49,6 +49,11 @@ public: Key(const Key &k) : key(k) {} ~Key() {} + static Key* CastFrom(key* k) + { return static_cast(k); } + static const Key* CastFrom(const key* k) + { return static_cast(k); } + void SetTo(uint32 dirID, uint32 objectID, uint64 offset, uint32 type, uint16 version) { diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/List.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/List.h index 0eef6cd0b8..0239f6e0a6 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/List.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/List.h @@ -88,7 +88,7 @@ private: // sDefaultItem template -List::item_t +typename List::item_t List::sDefaultItem( DEFAULT_ITEM_SUPPLIER::GetItem()); @@ -116,7 +116,7 @@ List::~List() // GetDefaultItem template inline -const List::item_t & +const typename List::item_t & List::GetDefaultItem() const { return sDefaultItem; @@ -125,7 +125,7 @@ List::GetDefaultItem() const // GetDefaultItem template inline -List::item_t & +typename List::item_t & List::GetDefaultItem() { return sDefaultItem; @@ -264,7 +264,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) @@ -274,7 +274,7 @@ List::ItemAt(int32 index) const // ItemAt template -List::item_t & +typename List::item_t & List::ItemAt(int32 index) { if (index >= 0 && index < fItemCount) @@ -284,7 +284,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/reiserfs/Settings.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Settings.cpp index 998eab0e78..a4573a1a82 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Settings.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Settings.cpp @@ -24,6 +24,8 @@ #include "Settings.h" #include "Debug.h" +using std::nothrow; + /*! \class Settings \brief Manages the ReiserFS settings. diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/StatItem.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/StatItem.h index 2a65c207c5..13cd3f4456 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/StatItem.h +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/StatItem.h @@ -42,13 +42,13 @@ */ class StatData { public: - StatData() : fVersion(STAT_DATA_V2), fCurrentData(NULL) {} + StatData() : fCurrentData(NULL), fVersion(STAT_DATA_V2) {} StatData(const StatData &data) - : fVersion(STAT_DATA_V2), fCurrentData(NULL) { *this = data; } + : fCurrentData(NULL), fVersion(STAT_DATA_V2) { *this = data; } StatData(stat_data_v1 *data, bool clone = false) - : fVersion(STAT_DATA_V2), fCurrentData(NULL) { SetTo(data, clone); } + : fCurrentData(NULL), fVersion(STAT_DATA_V2) { SetTo(data, clone); } StatData(stat_data *data, bool clone = false) - : fVersion(STAT_DATA_V2), fCurrentData(NULL) { SetTo(data, clone); } + : fCurrentData(NULL), fVersion(STAT_DATA_V2) { SetTo(data, clone); } ~StatData() { Unset(); } status_t SetTo(stat_data_v1 *data, bool clone = false) diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/String.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/String.cpp index 8b7a0d78cc..96d58f1e74 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/String.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/String.cpp @@ -24,6 +24,8 @@ #include "String.h" +using std::nothrow; + /*! \class String \brief A very simple string class. diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/SuperBlock.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/SuperBlock.cpp index 41ea81941b..24fcc099be 100644 --- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/SuperBlock.cpp +++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/SuperBlock.cpp @@ -26,6 +26,8 @@ #include "Debug.h" #include "SuperBlock.h" +using std::nothrow; + /*! \class DirEntry \brief Represents the on-disk structure for super block of the FS.