[Scummvm-git-logs] scummvm master -> a9b4d0dc0c690319f37a1fc24e88e0aea902a873

[sev-]

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

Summary:
a9b4d0dc0c COMMON: Fix build issue with old GCC


Commit: a9b4d0dc0c690319f37a1fc24e88e0aea902a873
    https://github.com/scummvm/scummvm/commit/a9b4d0dc0c690319f37a1fc24e88e0aea902a873
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-09-02T22:07:13+02:00

Commit Message:
COMMON: Fix build issue with old GCC

GCC 4.7 does not support constructor inheritance.
Also make non-members operators generic and add a conversion from Point
to Point32.

Changed paths:
    common/rect.h


diff --git a/common/rect.h b/common/rect.h
index 16db25897ec..e6e8b5e9352 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -129,15 +129,23 @@ struct PointBase {
 	}
 };
 
-struct Point   : public PointBase<int16, Point  > {
-	using PointBase::PointBase;
-};
-struct Point32 : public PointBase<int32, Point32> {
-	using PointBase::PointBase;
-};
-
-static inline Point operator*(int multiplier, const Point &p) { return Point(p.x * multiplier, p.y * multiplier); }
-static inline Point operator*(double multiplier, const Point &p) { return Point((int16)(p.x * multiplier), (int16)(p.y * multiplier)); }
+/**
+ * Old GCC don't support constructor inheritance
+ */
+#define BEGIN_POINT_TYPE(T, Point) \
+	struct Point : public PointBase<T, Point> {
+#define END_POINT_TYPE(T, Point) \
+		constexpr Point() : PointBase() {} \
+		constexpr Point(T x1, T y1) : PointBase(x1, y1) {} \
+	}; \
+	static inline Point operator*(int multiplier, const Point &p) { return Point(p.x * multiplier, p.y * multiplier); } \
+	static inline Point operator*(double multiplier, const Point &p) { return Point((T)(p.x * multiplier), (T)(p.y * multiplier)); }
+
+BEGIN_POINT_TYPE(int16, Point)
+END_POINT_TYPE(int16, Point)
+BEGIN_POINT_TYPE(int32, Point32)
+		constexpr Point32(const Point &o) : PointBase(o.x, o.y) {}
+END_POINT_TYPE(int32, Point32)
 
 /**
  * Simple class for handling a rectangular zone.
@@ -499,12 +507,24 @@ struct RectBase {
 	}
 };
 
-struct Rect   : public RectBase<int16, Rect,   Point  > {
-	using RectBase::RectBase;
-};
-struct Rect32 : public RectBase<int32, Rect32, Point32> {
-	using RectBase::RectBase;
-};
+/**
+ * Old GCC don't support constructor inheritance
+ */
+#define BEGIN_RECT_TYPE(T, Rect, Point) \
+	struct Rect : public RectBase<T, Rect, Point> {
+
+#define END_RECT_TYPE(T, Rect, Point) \
+		constexpr Rect() : RectBase() {} \
+		constexpr Rect(T w, T h) : RectBase(w, h) {} \
+		Rect(const Point &topLeft, const Point &bottomRight) : RectBase(topLeft, bottomRight) {} \
+		constexpr Rect(const Point &topLeft, T w, T h) : RectBase(topLeft, w, h) {} \
+		Rect(T x1, T y1, T x2, T y2) : RectBase(x1, y1, x2, y2) {} \
+	};
+
+BEGIN_RECT_TYPE(int16, Rect, Point)
+END_RECT_TYPE(int16, Rect, Point)
+BEGIN_RECT_TYPE(int32, Rect32, Point32)
+END_RECT_TYPE(int32, Rect32, Point32)
 /** @} */
 
 } // End of namespace Common