Skip to content

Fix C++20 comparisons for XNFLOAT{3,4}X{3,4} #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JBBieniek wants to merge 1 commit into
base: main
Choose a base branch
from
+91 −8
Open

Fix C++20 comparisons for XNFLOAT{3,4}X{3,4} #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 91 additions & 8 deletions Inc/DirectXMath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,25 @@ namespace DirectX
float& operator() (size_t Row, size_t Column) noexcept { return m[Row][Column]; }

#if (__cplusplus >= 202002L)
bool operator == (const XMFLOAT3X3&) const = default;
auto operator <=> (const XMFLOAT3X3&) const = default;
bool operator == (const XMFLOAT3X3& M) const noexcept
{
return _11 == M._11 && _12 == M._12 && _13 == M._13
&& _21 == M._21 && _22 == M._22 && _23 == M._23
&& _31 == M._31 && _32 == M._32 && _33 == M._33;
}

auto operator <=> (const XMFLOAT3X3& M) const noexcept
{
if (auto cmp = _11 <=> M._11; cmp != 0) return cmp;
if (auto cmp = _12 <=> M._12; cmp != 0) return cmp;
if (auto cmp = _13 <=> M._13; cmp != 0) return cmp;
if (auto cmp = _21 <=> M._21; cmp != 0) return cmp;
if (auto cmp = _22 <=> M._22; cmp != 0) return cmp;
if (auto cmp = _23 <=> M._23; cmp != 0) return cmp;
if (auto cmp = _31 <=> M._31; cmp != 0) return cmp;
if (auto cmp = _32 <=> M._32; cmp != 0) return cmp;
return _33 <=> M._33;
}
#endif
};

Expand Down Expand Up @@ -910,8 +927,29 @@ namespace DirectX
float& operator() (size_t Row, size_t Column) noexcept { return m[Row][Column]; }

#if (__cplusplus >= 202002L)
bool operator == (const XMFLOAT4X3&) const = default;
auto operator <=> (const XMFLOAT4X3&) const = default;
bool operator == (const XMFLOAT4X3& M) const noexcept
{
return _11 == M._11 && _12 == M._12 && _13 == M._13
&& _21 == M._21 && _22 == M._22 && _23 == M._23
&& _31 == M._31 && _32 == M._32 && _33 == M._33
&& _41 == M._41 && _42 == M._42 && _43 == M._43;
}

auto operator <=> (const XMFLOAT4X3& M) const noexcept
{
if (auto cmp = _11 <=> M._11; cmp != 0) return cmp;
if (auto cmp = _12 <=> M._12; cmp != 0) return cmp;
if (auto cmp = _13 <=> M._13; cmp != 0) return cmp;
if (auto cmp = _21 <=> M._21; cmp != 0) return cmp;
if (auto cmp = _22 <=> M._22; cmp != 0) return cmp;
if (auto cmp = _23 <=> M._23; cmp != 0) return cmp;
if (auto cmp = _31 <=> M._31; cmp != 0) return cmp;
if (auto cmp = _32 <=> M._32; cmp != 0) return cmp;
if (auto cmp = _33 <=> M._33; cmp != 0) return cmp;
if (auto cmp = _41 <=> M._41; cmp != 0) return cmp;
if (auto cmp = _42 <=> M._42; cmp != 0) return cmp;
return _43 <=> M._43;
}
#endif
};

Expand Down Expand Up @@ -958,8 +996,28 @@ namespace DirectX
float& operator() (size_t Row, size_t Column) noexcept { return m[Row][Column]; }

#if (__cplusplus >= 202002L)
bool operator == (const XMFLOAT3X4&) const = default;
auto operator <=> (const XMFLOAT3X4&) const = default;
bool operator == (const XMFLOAT3X4& M) const noexcept
{
return _11 == M._11 && _12 == M._12 && _13 == M._13 && _14 == M._14
&& _21 == M._21 && _22 == M._22 && _23 == M._23 && _24 == M._24
&& _31 == M._31 && _32 == M._32 && _33 == M._33 && _34 == M._34;
}

auto operator <=> (const XMFLOAT3X4& M) const noexcept
{
if (auto cmp = _11 <=> M._11; cmp != 0) return cmp;
if (auto cmp = _12 <=> M._12; cmp != 0) return cmp;
if (auto cmp = _13 <=> M._13; cmp != 0) return cmp;
if (auto cmp = _14 <=> M._14; cmp != 0) return cmp;
if (auto cmp = _21 <=> M._21; cmp != 0) return cmp;
if (auto cmp = _22 <=> M._22; cmp != 0) return cmp;
if (auto cmp = _23 <=> M._23; cmp != 0) return cmp;
if (auto cmp = _24 <=> M._24; cmp != 0) return cmp;
if (auto cmp = _31 <=> M._31; cmp != 0) return cmp;
if (auto cmp = _32 <=> M._32; cmp != 0) return cmp;
if (auto cmp = _33 <=> M._33; cmp != 0) return cmp;
return _34 <=> M._34;
}
#endif
};

Expand Down Expand Up @@ -1008,8 +1066,33 @@ namespace DirectX
float& operator() (size_t Row, size_t Column) noexcept { return m[Row][Column]; }

#if (__cplusplus >= 202002L)
bool operator == (const XMFLOAT4X4&) const = default;
auto operator <=> (const XMFLOAT4X4&) const = default;
bool operator == (const XMFLOAT4X4& M) const noexcept
{
return _11 == M._11 && _12 == M._12 && _13 == M._13 && _14 == M._14
&& _21 == M._21 && _22 == M._22 && _23 == M._23 && _24 == M._24
&& _31 == M._31 && _32 == M._32 && _33 == M._33 && _34 == M._34
&& _41 == M._41 && _42 == M._42 && _43 == M._43 && _44 == M._44;
}

auto operator <=> (const XMFLOAT4X4& M) const noexcept
{
if (auto cmp = _11 <=> M._11; cmp != 0) return cmp;
if (auto cmp = _12 <=> M._12; cmp != 0) return cmp;
if (auto cmp = _13 <=> M._13; cmp != 0) return cmp;
if (auto cmp = _14 <=> M._14; cmp != 0) return cmp;
if (auto cmp = _21 <=> M._21; cmp != 0) return cmp;
if (auto cmp = _22 <=> M._22; cmp != 0) return cmp;
if (auto cmp = _23 <=> M._23; cmp != 0) return cmp;
if (auto cmp = _24 <=> M._24; cmp != 0) return cmp;
if (auto cmp = _31 <=> M._31; cmp != 0) return cmp;
if (auto cmp = _32 <=> M._32; cmp != 0) return cmp;
if (auto cmp = _33 <=> M._33; cmp != 0) return cmp;
if (auto cmp = _34 <=> M._34; cmp != 0) return cmp;
if (auto cmp = _41 <=> M._41; cmp != 0) return cmp;
if (auto cmp = _42 <=> M._42; cmp != 0) return cmp;
if (auto cmp = _43 <=> M._43; cmp != 0) return cmp;
return _44 <=> M._44;
}
#endif
};

Expand Down