Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

timestamp: Correct duplicate conditionals

Browse source 
Previously, the milliseconds field wasn't being used in comparisons on
Windows.
This commit is contained in:
Lioncash 2020-06-23 06:24:04 -04:00
parent 987b11a1d2
commit 4c82705e34
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/common/timestamp.cpp
View file

@ -248,16 +248,16 @@ bool Timestamp::operator<(const Timestamp& other) const
else if (m_value.wMinute < other.m_value.wMinute)
return true;
if (m_value.wHour > other.m_value.wHour)
return false;
else if (m_value.wHour < other.m_value.wHour)
return true;
if (m_value.wSecond > other.m_value.wSecond)
return false;
else if (m_value.wSecond < other.m_value.wSecond)
return true;
if (m_value.wMilliseconds > other.m_value.wMilliseconds)
return false;
else if (m_value.wMilliseconds < other.m_value.wMilliseconds)
return true;
return false;
#else
@ -306,16 +306,16 @@ bool Timestamp::operator<=(const Timestamp& other) const
else if (m_value.wMinute < other.m_value.wMinute)
return true;
if (m_value.wHour > other.m_value.wHour)
return false;
else if (m_value.wHour < other.m_value.wHour)
return true;
if (m_value.wSecond > other.m_value.wSecond)
return false;
else if (m_value.wSecond <= other.m_value.wSecond)
return true;
if (m_value.wMilliseconds > other.m_value.wMilliseconds)
return false;
else if (m_value.wMilliseconds < other.m_value.wMilliseconds)
return true;
return false;
#else
@ -364,16 +364,16 @@ bool Timestamp::operator>(const Timestamp& other) const
else if (m_value.wMinute > other.m_value.wMinute)
return true;
if (m_value.wHour < other.m_value.wHour)
return false;
else if (m_value.wHour > other.m_value.wHour)
return true;
if (m_value.wSecond < other.m_value.wSecond)
return false;
else if (m_value.wSecond > other.m_value.wSecond)
return true;
if (m_value.wMilliseconds < other.m_value.wMilliseconds)
return false;
else if (m_value.wMilliseconds > other.m_value.wMilliseconds)
return true;
return false;
#else
@ -422,16 +422,16 @@ bool Timestamp::operator>=(const Timestamp& other) const
else if (m_value.wMinute > other.m_value.wMinute)
return true;
if (m_value.wHour < other.m_value.wHour)
return false;
else if (m_value.wHour > other.m_value.wHour)
return true;
if (m_value.wSecond < other.m_value.wSecond)
return false;
else if (m_value.wSecond >= other.m_value.wSecond)
return true;
if (m_value.wMilliseconds < other.m_value.wMilliseconds)
return false;
else if (m_value.wMilliseconds > other.m_value.wMilliseconds)
return true;
return false;
#else