Merge branch 'tieped' into 'master'

Work around a regression in MSVC

See merge request OpenMW/openmw!4478
master
Alexei Kotov 3 weeks ago
commit e4cced09ca

@ -28,7 +28,8 @@ namespace ESM
int32_t getX() const { return mX; } int32_t getX() const { return mX; }
int32_t getY() const { return mY; } 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); return std::tie(value.mX, value.mY);
} }

@ -25,7 +25,8 @@ namespace ESM
std::string toDebugString() const; 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); return std::tie(value.mRecordType, value.mValue);
} }

Loading…
Cancel
Save