[Gemrb-commits] gemrb: branch master updated. v0.6.2-1178-g60060c7

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  60060c7f6230553f0c39a1b3083043071f385e4a (commit)

Summary of changes:
 gemrb/core/Region.cpp |   40 ----------------------------------------
 gemrb/core/Region.h   |    6 ------
 2 files changed, 0 insertions(+), 46 deletions(-)
      from  27ef23dce64ebfdf9bef4a684cafd58d92b6d4c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=60060c7f6230553f0c39a1b3083043071f385e4a

commit 60060c7f6230553f0c39a1b3083043071f385e4a
Author: Tom Prince <tom...@ua...>
Date:   Sun May 1 14:50:36 2011 -0400

    Remove copy constructor/assignment/destructor for Region/Point.
    
    They are exactly the same as the default ones, so just let the
    compiler synthesize them.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/Region.cpp b/gemrb/core/Region.cpp
index 0ab46be..6bf88e3 100644
--- a/gemrb/core/Region.cpp
+++ b/gemrb/core/Region.cpp
@@ -27,25 +27,6 @@ Point::Point(void)
 	//memset(this, 0, sizeof(*this));
 }
 
-Point::~Point(void)
-{
-}
-
-Point::Point(const Point& pnt)
-{
-	x=pnt.x;
-	y=pnt.y;
-	//memcpy(this, &pnt, sizeof(*this));
-}
-
-Point& Point::operator=(const Point& pnt)
-{
-	x = pnt.x;
-	y = pnt.y;
-	//memcpy(this, &pnt, sizeof(*this));
-	return *this;
-}
-
 bool Point::operator==(const Point& pnt)
 {
 	if (( x == pnt.x ) && ( y == pnt.y )) {
@@ -113,27 +94,6 @@ Region::Region(void)
 	x = y = w = h = 0;
 }
 
-Region::~Region(void)
-{
-}
-
-Region::Region(const Region& rgn)
-{
-	x = rgn.x;
-	y = rgn.y;
-	w = rgn.w;
-	h = rgn.h;
-}
-
-Region& Region::operator=(const Region& rgn)
-{
-	x = rgn.x;
-	y = rgn.y;
-	w = rgn.w;
-	h = rgn.h;
-	return *this;
-}
-
 bool Region::operator==(const Region& rgn)
 {
 	if (( x == rgn.x ) && ( y == rgn.y ) && ( w == rgn.w ) && ( h == rgn.h )) {
diff --git a/gemrb/core/Region.h b/gemrb/core/Region.h
index 675663b..759aa8d 100644
--- a/gemrb/core/Region.h
+++ b/gemrb/core/Region.h
@@ -39,11 +39,8 @@
 class GEM_EXPORT Point {
 public:
 	Point(void);
-	Point(const Point& pnt);
 	Point(short x, short y);
-	~Point(void);
 
-	Point& operator=(const Point& pnt);
 	bool operator==(const Point &pnt);
 	bool operator!=(const Point &pnt);
 
@@ -76,14 +73,11 @@ public:
 class GEM_EXPORT Region {
 public:
 	Region(void);
-	~Region(void);
 	int x;
 	int y;
 	int w;
 	int h;
-	Region(const Region& rgn);
 	Region(const Point& p, int w, int h);
-	Region& operator=(const Region& rgn);
 	bool operator==(const Region& rgn);
 	bool operator!=(const Region& rgn);
 	Region(int x, int y, int w, int h);

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator