aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJohannes Schickel2012-02-22 20:08:40 +0100
committerJohannes Schickel2012-02-22 20:08:40 +0100
commit03959c18dc162f4970ee40931a00ac242affda1b (patch)
tree33fa5ce70a3842650b7f78a6adc35e26bda08047 /common
parent7d8da240820fa9cafc8e3090c007051a29d8d79f (diff)
downloadscummvm-rg350-03959c18dc162f4970ee40931a00ac242affda1b.tar.gz
scummvm-rg350-03959c18dc162f4970ee40931a00ac242affda1b.tar.bz2
scummvm-rg350-03959c18dc162f4970ee40931a00ac242affda1b.zip
COMMON: Slight formatting fixes in stack.h.
Diffstat (limited to 'common')
-rw-r--r--common/stack.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/common/stack.h b/common/stack.h
index 235715dac3..bc5de9ac7f 100644
--- a/common/stack.h
+++ b/common/stack.h
@@ -40,40 +40,49 @@ public:
bool empty() const {
return _size <= 0;
}
+
void clear() {
_size = 0;
}
+
void push(const T &x) {
assert(_size < MAX_SIZE);
_stack[_size++] = x;
}
+
const T &top() const {
assert(_size > 0);
return _stack[_size - 1];
}
+
T &top() {
assert(_size > 0);
return _stack[_size - 1];
}
+
T pop() {
T tmp = top();
--_size;
return tmp;
}
+
size_type size() const {
return _size;
}
+
T &operator[](size_type i) {
assert(i < MAX_SIZE);
return _stack[i];
}
+
const T &operator[](size_type i) const {
assert(i < MAX_SIZE);
return _stack[i];
}
+
protected:
- T _stack[MAX_SIZE];
- size_type _size;
+ T _stack[MAX_SIZE];
+ size_type _size;
};
@@ -83,7 +92,7 @@ protected:
template<class T>
class Stack {
private:
- Array<T> _stack;
+ Array<T> _stack;
public:
typedef typename Array<T>::size_type size_type;
@@ -94,29 +103,37 @@ public:
bool empty() const {
return _stack.empty();
}
+
void clear() {
_stack.clear();
}
+
void push(const T &x) {
_stack.push_back(x);
}
+
T &top() {
return _stack.back();
}
+
const T &top() const {
return _stack.back();
}
+
T pop() {
T tmp = _stack.back();
_stack.pop_back();
return tmp;
}
+
size_type size() const {
return _stack.size();
}
+
T &operator[](size_type i) {
return _stack[i];
}
+
const T &operator[](size_type i) const {
return _stack[i];
}