Merge branch 'tieped' into 'master'

Work around a regression in MSVC See merge request OpenMW/openmw!4478
OpenMW · Dec 11, 2024 · e4cced0 · e4cced0
2 parents 51579a8 + 6090bfc
commit e4cced0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/components/esm/esm3exteriorcellrefid.hpp b/components/esm/esm3exteriorcellrefid.hpp
@@ -28,7 +28,8 @@ namespace ESM
         int32_t getX() const { return mX; }
         int32_t getY() const { return mY; }
 
-        friend inline constexpr auto tie(const ESM3ExteriorCellRefId& value) noexcept
+        friend inline constexpr std::tuple<const int32_t&, const int32_t&> tie(
+            const ESM3ExteriorCellRefId& value) noexcept
         {
             return std::tie(value.mX, value.mY);
         }

diff --git a/components/esm/indexrefid.hpp b/components/esm/indexrefid.hpp
@@ -25,7 +25,8 @@ namespace ESM
 
         std::string toDebugString() const;
 
-        friend inline constexpr auto tie(const IndexRefId& value) noexcept
+        friend inline constexpr std::tuple<const ESM::RecNameInts&, const uint32_t&> tie(
+            const IndexRefId& value) noexcept
         {
             return std::tie(value.mRecordType, value.mValue);
         }