Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch 'tieped' into 'master'
Some checks failed
CMake / Ubuntu (push) Has been cancelled
Details
CMake / MacOS (push) Has been cancelled
Details
CMake / windows-2019 (push) Has been cancelled
Details
CMake / windows-2022 (push) Has been cancelled
Details

Browse source 
Work around a regression in MSVC

See merge request OpenMW/openmw!4478
This commit is contained in:
Alexei Kotov 2024-12-11 13:14:16 +00:00
commit e4cced09ca
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/esm/esm3exteriorcellrefid.hpp
View file

@ -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);
}

3
components/esm/indexrefid.hpp
View file

@ -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);
}