aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2009-04-21 17:02:09 +0000
committerMax Horn2009-04-21 17:02:09 +0000
commit7caad280d1c58bdb7acc502c4526a0c8fb0d223e (patch)
tree127cb433f90c681a2452762ee02f0d9b7bad6f0e /common
parent319a4f8aa92a3ff8fb31c9c82bb418abd45464a6 (diff)
downloadscummvm-rg350-7caad280d1c58bdb7acc502c4526a0c8fb0d223e.tar.gz
scummvm-rg350-7caad280d1c58bdb7acc502c4526a0c8fb0d223e.tar.bz2
scummvm-rg350-7caad280d1c58bdb7acc502c4526a0c8fb0d223e.zip
COMMON: Removed copy constructors / assignment operators in cases where they are identical to the automatically generated ones. Also removed a pointless 'explicit'
svn-id: r40049
Diffstat (limited to 'common')
-rw-r--r--common/queue.h9
-rw-r--r--common/rect.h4
-rw-r--r--common/stack.h7
3 files changed, 5 insertions, 15 deletions
diff --git a/common/queue.h b/common/queue.h
index be6df0148a..cfe7f4e596 100644
--- a/common/queue.h
+++ b/common/queue.h
@@ -35,18 +35,13 @@ namespace Common {
*/
template<class T>
class Queue {
-public:
- typedef T value_type;
+//public:
+// typedef T value_type;
public:
Queue<T>() : _impl() {}
Queue<T>(const Queue<T> &queue) : _impl(queue._impl) {}
- Queue<T> &operator=(const Queue<T> &queue) {
- _impl = queue._impl;
- return *this;
- }
-
bool empty() const {
return _impl.empty();
}
diff --git a/common/rect.h b/common/rect.h
index a0ccd07f90..18cc4e56c3 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -40,9 +40,7 @@ struct Point {
int16 y; //!< The vertical part of the point
Point() : x(0), y(0) {}
- Point(const Point &p) : x(p.x), y(p.y) {}
- explicit Point(int16 x1, int16 y1) : x(x1), y(y1) {}
- Point & operator=(const Point & p) { x = p.x; y = p.y; return *this; };
+ Point(int16 x1, int16 y1) : x(x1), y(y1) {}
bool operator==(const Point & p) const { return x == p.x && y == p.y; };
bool operator!=(const Point & p) const { return x != p.x || y != p.y; };
diff --git a/common/stack.h b/common/stack.h
index e20e81028d..be6f1b8d10 100644
--- a/common/stack.h
+++ b/common/stack.h
@@ -83,16 +83,13 @@ public:
*/
template<class T>
class Stack {
-protected:
+private:
Array<T> _stack;
+
public:
Stack<T>() {}
Stack<T>(const Array<T> &stackContent) : _stack(stackContent) {}
- Stack<T>& operator=(const Stack<T> &st) {
- _stack = st._stack;
- return *this;
- }
bool empty() const {
return _stack.empty();
}