Ticket #1852: wrong-operator-signature.patch

trunk/source/gui/GUIRenderer.cpp

@@ -50 +50 @@
 {
 }
 
-const DrawCalls& DrawCalls::operator=(const DrawCalls&)
+DrawCalls& DrawCalls::operator=(const DrawCalls&)
 {
     return *this;
 }

trunk/source/gui/GUIRenderer.h

@@ -69 +69 @@
         DrawCalls();
         // Copy/assignment results in an empty list, not an actual copy
         DrawCalls(const DrawCalls&);
-        const DrawCalls& operator=(const DrawCalls&);
+        DrawCalls& operator=(const DrawCalls&);
     };
 }
 

trunk/source/ps/Overlay.cpp

@@ -103 +103 @@
 }
 
 // =
-void CRect::operator = (const CRect& a)
+CRect& CRect::operator = (const CRect& a)
 {
     left = a.left;
     top = a.top;
     right = a.right;
     bottom = a.bottom;
+    return *this;
 }
 
 // ==
@@ -296 +297 @@
 }
 
 // =
-void CPos::operator = (const CPos& a)
+CPos& CPos::operator = (const CPos& a)
 {
     x = a.x;
     y = a.y;
+    return *this;
 }
 
 // ==
@@ -397 +399 @@
 }
 
 // =
-void CSize::operator = (const CSize& a)
+CSize& CSize::operator = (const CSize& a)
 {
     cx = a.cx;
     cy = a.cy;
+    return *this;
 }
 
 // ==

trunk/source/ps/Overlay.h

@@ -79 +79 @@
     CRect(const float l, const float t, const float r, const float b);
 
     // Operators
-    void                operator =  (const CRect& a);
+    CRect&              operator =  (const CRect& a);
     bool                operator == (const CRect& a) const;
     bool                operator != (const CRect& a) const;
     CRect               operator -  (void) const;
@@ -172 +172 @@
     CPos(const float &_x, const float &_y);
 
     // Operators
-    void                operator =  (const CPos& a);
+    CPos&               operator =  (const CPos& a);
     bool                operator == (const CPos& a) const;
     bool                operator != (const CPos& a) const;
     CPos                operator -  (void) const;
@@ -211 +211 @@
     CSize(const float &_cx, const float &_cy);
 
     // Operators
-    void                operator =  (const CSize& a);
+    CSize&              operator =  (const CSize& a);
     bool                operator == (const CSize& a) const;
     bool                operator != (const CSize& a) const;
     CSize               operator -  (void) const;