[Scummvm-git-logs] scummvm master -> 4a5e96ce6fa654828195c5a45024ce3481c636d2

digitall 547637+digitall at users.noreply.github.com
Sat Mar 13 11:31:17 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4a5e96ce6f TINYGL: Fix GCC Warning for Implicit Copy Operator


Commit: 4a5e96ce6fa654828195c5a45024ce3481c636d2
    https://github.com/scummvm/scummvm/commit/4a5e96ce6fa654828195c5a45024ce3481c636d2
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-13T11:28:46Z

Commit Message:
TINYGL: Fix GCC Warning for Implicit Copy Operator

This is emitted when -Wdeprecated-copy is enabled. The fix implemented
is to explicitly declare this to be the default copy operator.

Since this may be a latent bug, this is marked with a FIXME.

Changed paths:
    graphics/tinygl/zblit.cpp


diff --git a/graphics/tinygl/zblit.cpp b/graphics/tinygl/zblit.cpp
index 6b373848b3..9039d2b2d4 100644
--- a/graphics/tinygl/zblit.cpp
+++ b/graphics/tinygl/zblit.cpp
@@ -115,8 +115,9 @@ public:
 			_pixels = _buf.getRawBuffer();
 		}
 
-		Line(const Line& other) : _buf(other._buf.getFormat(), other._length, DisposeAfterUse::NO),
-					_x(other._x), _y(other._y), _length(other._length){
+		Line &operator=(const Line &other) = default; // FIXME: This may need replacing with custom copy operator code
+
+		Line(const Line& other) : _buf(other._buf.getFormat(), other._length, DisposeAfterUse::NO), _x(other._x), _y(other._y), _length(other._length) {
 			_buf.copyBuffer(0, 0, _length, other._buf);
 			_pixels = _buf.getRawBuffer();
 		}




More information about the Scummvm-git-logs mailing list