[Scummvm-git-logs] scummvm master -> 11654c8fbfd310a50c0c7dd382acfedbdef5a3d6

[digitall]

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

Summary:
7beaae25ba TINYGL: Fix Compilation with pre-C++-11 Compilers
11654c8fbf COMMON: Fix Compilation with pre-C++-11 Compilers


Commit: 7beaae25ba4f7f47cdf759d46bace1756c373bb6
    https://github.com/scummvm/scummvm/commit/7beaae25ba4f7f47cdf759d46bace1756c373bb6
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-13T19:42:56Z

Commit Message:
TINYGL: Fix Compilation with pre-C++-11 Compilers

Changed paths:
    graphics/tinygl/zblit.cpp


diff --git a/graphics/tinygl/zblit.cpp b/graphics/tinygl/zblit.cpp
index 9039d2b2d4..68a6730443 100644
--- a/graphics/tinygl/zblit.cpp
+++ b/graphics/tinygl/zblit.cpp
@@ -115,7 +115,9 @@ public:
 			_pixels = _buf.getRawBuffer();
 		}
 
+#ifdef USE_CXX11
 		Line &operator=(const Line &other) = default; // FIXME: This may need replacing with custom copy operator code
+#endif
 
 		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);


Commit: 11654c8fbfd310a50c0c7dd382acfedbdef5a3d6
    https://github.com/scummvm/scummvm/commit/11654c8fbfd310a50c0c7dd382acfedbdef5a3d6
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-13T19:44:17Z

Commit Message:
COMMON: Fix Compilation with pre-C++-11 Compilers

Changed paths:
    common/queue.h


diff --git a/common/queue.h b/common/queue.h
index d4ab2e05c8..65a03ca553 100644
--- a/common/queue.h
+++ b/common/queue.h
@@ -47,7 +47,9 @@ class Queue {
 public:
 	Queue<T>() : _impl() {}
 	Queue<T>(const Queue<T> &queue) : _impl(queue._impl) {}
+#ifdef USE_CXX11
 	Queue<T> &operator=(const Queue<T> &other) = default; // FIXME: This may need replacing with custom copy operator code
+#endif
 
 	bool empty() const {
 		return _impl.empty();