[Scummvm-cvs-logs] SF.net SVN: scummvm:[40049] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Apr 21 19:02:09 CEST 2009


Revision: 40049
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40049&view=rev
Author:   fingolfin
Date:     2009-04-21 17:02:09 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
COMMON: Removed copy constructors / assignment operators in cases where they are identical to the automatically generated ones. Also removed a pointless 'explicit'

Modified Paths:
--------------
    scummvm/trunk/common/queue.h
    scummvm/trunk/common/rect.h
    scummvm/trunk/common/stack.h

Modified: scummvm/trunk/common/queue.h
===================================================================
--- scummvm/trunk/common/queue.h	2009-04-21 14:01:43 UTC (rev 40048)
+++ scummvm/trunk/common/queue.h	2009-04-21 17:02:09 UTC (rev 40049)
@@ -35,18 +35,13 @@
  */
 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();
 	}

Modified: scummvm/trunk/common/rect.h
===================================================================
--- scummvm/trunk/common/rect.h	2009-04-21 14:01:43 UTC (rev 40048)
+++ scummvm/trunk/common/rect.h	2009-04-21 17:02:09 UTC (rev 40049)
@@ -40,9 +40,7 @@
 	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; };
 

Modified: scummvm/trunk/common/stack.h
===================================================================
--- scummvm/trunk/common/stack.h	2009-04-21 14:01:43 UTC (rev 40048)
+++ scummvm/trunk/common/stack.h	2009-04-21 17:02:09 UTC (rev 40049)
@@ -83,16 +83,13 @@
  */
 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();
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list