From b68efdcaa7f9c148cbf77b6e8bf60978f0bd5978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 18 Oct 2005 20:03:00 +0000 Subject: [PATCH] We now use the kernel's Stack class instead of our own copy. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14417 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/file_systems/bfs/BPlusTree.cpp | 2 +- .../file_systems/bfs/BlockAllocator.cpp | 2 +- src/add-ons/kernel/file_systems/bfs/Query.cpp | 1 - src/add-ons/kernel/file_systems/bfs/Query.h | 8 +-- src/add-ons/kernel/file_systems/bfs/Stack.h | 63 ------------------- 5 files changed, 6 insertions(+), 70 deletions(-) delete mode 100644 src/add-ons/kernel/file_systems/bfs/Stack.h diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp index cbefb2b3f8..f52efbcd60 100644 --- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp +++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp @@ -12,9 +12,9 @@ #include "BPlusTree.h" #include "Inode.h" #include "Utility.h" -#include "Stack.h" #include +#include #include #include diff --git a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp index e470f176b8..d4153b21e9 100644 --- a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp +++ b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp @@ -10,9 +10,9 @@ #include "Volume.h" #include "Inode.h" #include "BPlusTree.h" -#include "Stack.h" #include "bfs_control.h" +#include #include #include diff --git a/src/add-ons/kernel/file_systems/bfs/Query.cpp b/src/add-ons/kernel/file_systems/bfs/Query.cpp index 2219bc9b7b..7b8b8a8852 100644 --- a/src/add-ons/kernel/file_systems/bfs/Query.cpp +++ b/src/add-ons/kernel/file_systems/bfs/Query.cpp @@ -12,7 +12,6 @@ #include "Query.h" #include "bfs.h" #include "Debug.h" -#include "Stack.h" #include "Volume.h" #include "Inode.h" #include "BPlusTree.h" diff --git a/src/add-ons/kernel/file_systems/bfs/Query.h b/src/add-ons/kernel/file_systems/bfs/Query.h index a8d05126c0..2966acc4e3 100644 --- a/src/add-ons/kernel/file_systems/bfs/Query.h +++ b/src/add-ons/kernel/file_systems/bfs/Query.h @@ -7,11 +7,11 @@ #define QUERY_H -#include - -#include "Index.h" -#include "Stack.h" #include "Chain.h" +#include "Index.h" + +#include +#include class Volume; class Term; diff --git a/src/add-ons/kernel/file_systems/bfs/Stack.h b/src/add-ons/kernel/file_systems/bfs/Stack.h deleted file mode 100644 index 4790204470..0000000000 --- a/src/add-ons/kernel/file_systems/bfs/Stack.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Stack - a template stack class - * - * Copyright 2001-2004, Axel Dörfler, axeld@pinc-software.de. - * This file may be used under the terms of the MIT License. - */ -#ifndef STACK_H -#define STACK_H - - -#include - - -template class Stack { - public: - Stack() - : - fArray(NULL), - fUsed(0), - fMax(0) - { - } - - ~Stack() - { - free(fArray); - } - - void MakeEmpty() - { - // could also free the memory - fUsed = 0; - } - - status_t Push(T value) - { - if (fUsed >= fMax) { - fMax += 16; - T *newArray = (T *)realloc(fArray, fMax * sizeof(T)); - if (newArray == NULL) - return B_NO_MEMORY; - - fArray = newArray; - } - fArray[fUsed++] = value; - return B_OK; - } - - bool Pop(T *value) - { - if (fUsed == 0) - return false; - - *value = fArray[--fUsed]; - return true; - } - - private: - T *fArray; - int32 fUsed; - int32 fMax; -}; - -#endif /* STACK_H */