RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

geometry.h: more cleanup

Browse Source 
Remove wrong constructors.
This commit is contained in:
Nekotekina 2020-02-12 12:44:24 +03:00
parent bacd234258
commit 7137142351
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Utilities/geometry.h
View File

@ -15,10 +15,6 @@ struct size2_base
{ {
} }
constexpr size2_base(const size2_base& rhs) : width{ rhs.width }, height{ rhs.height }
{
}
constexpr size2_base operator -(const size2_base& rhs) const constexpr size2_base operator -(const size2_base& rhs) const
{ {
return{ width - rhs.width, height - rhs.height }; return{ width - rhs.width, height - rhs.height };
@ -215,6 +211,8 @@ struct position1_base
return x == rhs; return x == rhs;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
bool operator !=(const position1_base& rhs) const bool operator !=(const position1_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
@ -224,6 +222,7 @@ struct position1_base
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
explicit operator position1_base<NT>() const explicit operator position1_base<NT>() const
@ -250,10 +249,6 @@ struct position2_base
{ {
} }
constexpr position2_base(const position2_base& rhs) : x{ rhs.x }, y{ rhs.y }
{
}
constexpr bool operator >(const position2_base& rhs) const constexpr bool operator >(const position2_base& rhs) const
{ {
return x > rhs.x && y > rhs.y; return x > rhs.x && y > rhs.y;
@ -388,6 +383,8 @@ struct position2_base
return x == rhs && y == rhs; return x == rhs && y == rhs;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator !=(const position2_base& rhs) const constexpr bool operator !=(const position2_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
@ -397,6 +394,7 @@ struct position2_base
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
explicit constexpr operator position2_base<NT>() const explicit constexpr operator position2_base<NT>() const
@ -480,6 +478,8 @@ struct position3_base
return x == rhs && y == rhs && z == rhs; return x == rhs && y == rhs && z == rhs;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
bool operator !=(const position3_base& rhs) const bool operator !=(const position3_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
@ -489,6 +489,7 @@ struct position3_base
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
explicit operator position3_base<NT>() const explicit operator position3_base<NT>() const
@ -570,6 +571,8 @@ struct position4_base
return x == rhs && y == rhs && z == rhs && w == rhs; return x == rhs && y == rhs && z == rhs && w == rhs;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator !=(const position4_base& rhs) const constexpr bool operator !=(const position4_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
@ -579,6 +582,7 @@ struct position4_base
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
explicit constexpr operator position4_base<NT>() const explicit constexpr operator position4_base<NT>() const
@ -621,11 +625,6 @@ struct coord_base
{ {
} }
constexpr coord_base(const coord_base<T>& other)
: position{ other.position }, size{ other.size }
{
}
constexpr coord_base(T x, T y, T width, T height) constexpr coord_base(T x, T y, T width, T height)
: x{ x }, y{ y }, width{ width }, height{ height } : x{ x }, y{ y }, width{ width }, height{ height }
{ {
@ -726,10 +725,13 @@ struct area_base
return x1 == rhs.x1 && x2 == rhs.x2 && y1 == rhs.y1 && y2 == rhs.y2; return x1 == rhs.x1 && x2 == rhs.x2 && y1 == rhs.y1 && y2 == rhs.y2;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const area_base& rhs) const constexpr bool operator != (const area_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
constexpr area_base operator - (const size2_base<T>& size) const constexpr area_base operator - (const size2_base<T>& size) const
{ {