From cc927f5231c5bfc36533978f465abd8e10b475f1 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Tue, 23 Jul 2024 14:44:43 +0200
Subject: [PATCH] Fix for GCC 15 two-phase lookup

* GCC 15 is more aggressive about checking dependent names:
  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=r15-2117-g313afcfdabeab3

Bug: https://bugs.gentoo.org/936522
---
 src/geometry.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/geometry.h b/src/geometry.h
index f01d8602..717debe5 100644
--- a/src/geometry.h
+++ b/src/geometry.h
@@ -486,9 +486,9 @@ struct rect {
 
   inline void set_width(T value) {
     if constexpr (Kind == rect_kind::SIZED) {
-      this->other.set_x(value);
+      this->m_other.set_x(value);
     } else {
-      this->other.set_x(this->m_pos.get_x() + value);
+      this->m_other.set_x(this->m_pos.get_x() + value);
     }
   }
   inline void set_height(T value) {
@@ -532,9 +532,9 @@ struct rect {
   std::array<vec2<T>, 4> corners() const {
     return std::array<vec2<T>, 4>{
         this->m_pos,
-        this->m_pos + vec2<T>(this->get_width(), 0),
-        this->get_end_pos(),
-        this->m_pos + vec2<T>(0, this->get_height()),
+        this->m_pos + vec2<T>(this->width(), 0),
+        this->end_pos(),
+        this->m_pos + vec2<T>(0, this->height()),
     };
   }