Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-03-06 14:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request from lioncash/stamp

Browse source 
timestamp: Correct duplicate conditionals
This commit is contained in:
Connor McLaughlin 2020-06-24 01:32:52 +10:00 committed by GitHub
parent 84d4423719 4c82705e34
commit 2cfb811569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 25 deletions

46
src/common/timestamp.cpp
View file

@ -216,11 +216,7 @@ bool Timestamp::operator==(const Timestamp& other) const
bool Timestamp::operator!=(const Timestamp& other) const bool Timestamp::operator!=(const Timestamp& other) const
{ {
#if defined(WIN32) return !operator==(other);
return std::memcmp(&m_value, &other.m_value, sizeof(m_value)) != 0;
#else
return std::memcmp(&m_value, &other.m_value, sizeof(m_value)) != 0;
#endif
} }
bool Timestamp::operator<(const Timestamp& other) const bool Timestamp::operator<(const Timestamp& other) const
@ -252,16 +248,16 @@ bool Timestamp::operator<(const Timestamp& other) const
else if (m_value.wMinute < other.m_value.wMinute) else if (m_value.wMinute < other.m_value.wMinute)
return true; 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) if (m_value.wSecond > other.m_value.wSecond)
return false; return false;
else if (m_value.wSecond < other.m_value.wSecond) else if (m_value.wSecond < other.m_value.wSecond)
return true; 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; return false;
#else #else
@ -310,16 +306,16 @@ bool Timestamp::operator<=(const Timestamp& other) const
else if (m_value.wMinute < other.m_value.wMinute) else if (m_value.wMinute < other.m_value.wMinute)
return true; 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) if (m_value.wSecond > other.m_value.wSecond)
return false; return false;
else if (m_value.wSecond <= other.m_value.wSecond) else if (m_value.wSecond <= other.m_value.wSecond)
return true; 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; return false;
#else #else
@ -368,16 +364,16 @@ bool Timestamp::operator>(const Timestamp& other) const
else if (m_value.wMinute > other.m_value.wMinute) else if (m_value.wMinute > other.m_value.wMinute)
return true; 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) if (m_value.wSecond < other.m_value.wSecond)
return false; return false;
else if (m_value.wSecond > other.m_value.wSecond) else if (m_value.wSecond > other.m_value.wSecond)
return true; 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; return false;
#else #else
@ -426,16 +422,16 @@ bool Timestamp::operator>=(const Timestamp& other) const
else if (m_value.wMinute > other.m_value.wMinute) else if (m_value.wMinute > other.m_value.wMinute)
return true; 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) if (m_value.wSecond < other.m_value.wSecond)
return false; return false;
else if (m_value.wSecond >= other.m_value.wSecond) else if (m_value.wSecond >= other.m_value.wSecond)
return true; 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; return false;
#else #else