Fix compilation of remove_at() in array.h. It was never tested before.

Make stacks' pop() return top value, not just move stack pointer.

svn-id: r14565

2 files changed, 9 insertions, 6 deletions

diff --git a/common/array.h b/common/array.h
index 9a40a392c4..6fde309ac4 100644
--- a/common/array.h
+++ b/common/array.h
@@ -78,11 +78,9 @@ public:
 		_size++;
 	}
 
-	T& remove_at(int idx) {
-		T& tmp;
-
+	T remove_at(int idx) {
 		assert(idx >= 0 && idx < _size);
-		tmp = _data[idx];
+		T tmp = _data[idx];
 		for (int i = idx; i < _size - 1; i++)
 			_data[i] = _data[i+1];
 		_size--;
diff --git a/common/stack.h b/common/stack.h
index acc8ae6c89..add790d695 100644
--- a/common/stack.h
+++ b/common/stack.h
@@ -54,9 +54,12 @@ public:
 		else
 			return 0;
 	}
-	void pop() {
+	T pop() {
+		T tmp;
 		assert(_size > 0);
+		tmp = _stack[_size];
 		_stack[--_size] = 0;
+		return tmp;
 	}
 	int size() const {
 		return _size;
@@ -94,8 +97,10 @@ public:
 		else
 			return 0;
 	}
-	void pop() {
+	T pop() {
+		T tmp = top();
 		_stack.remove_at(size() - 1);
+		return tmp;
 	}
 	int size() const {
 		return _stack.size();