Skip to content

Commit e4cced0

Browse files
committed
Merge branch 'tieped' into 'master'
Work around a regression in MSVC See merge request OpenMW/openmw!4478
2 parents 51579a8 + 6090bfc commit e4cced0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

components/esm/esm3exteriorcellrefid.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ namespace ESM
2828
int32_t getX() const { return mX; }
2929
int32_t getY() const { return mY; }
3030

31-
friend inline constexpr auto tie(const ESM3ExteriorCellRefId& value) noexcept
31+
friend inline constexpr std::tuple<const int32_t&, const int32_t&> tie(
32+
const ESM3ExteriorCellRefId& value) noexcept
3233
{
3334
return std::tie(value.mX, value.mY);
3435
}

components/esm/indexrefid.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ namespace ESM
2525

2626
std::string toDebugString() const;
2727

28-
friend inline constexpr auto tie(const IndexRefId& value) noexcept
28+
friend inline constexpr std::tuple<const ESM::RecNameInts&, const uint32_t&> tie(
29+
const IndexRefId& value) noexcept
2930
{
3031
return std::tie(value.mRecordType, value.mValue);
3132
}

0 commit comments

Comments
 (0)