From 6090bfcdab36c7fd4a008c463782c11a10fedafb Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Mon, 9 Dec 2024 17:23:17 +0100 Subject: [PATCH] Work around a regression in MSVC --- components/esm/esm3exteriorcellrefid.hpp | 3 ++- components/esm/indexrefid.hpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/esm/esm3exteriorcellrefid.hpp b/components/esm/esm3exteriorcellrefid.hpp index fd6a9b128d..82d2e23b26 100644 --- 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 tie( + const ESM3ExteriorCellRefId& value) noexcept { return std::tie(value.mX, value.mY); } diff --git a/components/esm/indexrefid.hpp b/components/esm/indexrefid.hpp index 283126f90c..fc3f13451e 100644 --- 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 tie( + const IndexRefId& value) noexcept { return std::tie(value.mRecordType, value.mValue); }