system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: Restrict timespec comparison operator overloads in AK::Time

Browse source 
The previous implementation was too generic, and would cause conflicting
operator overload errors when included in certain code paths. Fix this
by restricting the template parameters to types which have the same
member names as `struct timespec`.
This commit is contained in:
Brian Gianforcaro 2021-07-12 00:20:02 -07:00 committed by Ali Mohammad Pur
parent ccae0cae45
commit a2a5af9745
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
AK/Time.h
View file

@ -15,6 +15,14 @@
struct timeval;
struct timespec;
// Concept to detect types which look like timespec without requiring the type.
template<typename T>
concept TimeSpecType = requires(T t)
{
t.tv_sec;
t.tv_nsec;
};
namespace AK {
// Month and day start at 1. Month must be >= 1 and <= 12.
@ -241,38 +249,39 @@ inline void timespec_to_timeval(const TimespecType& ts, TimevalType& tv)
tv.tv_usec = ts.tv_nsec / 1000;
}
template<typename TimespecType>
inline bool operator>=(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator>=(const T& a, const T& b)
{
return a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_nsec >= b.tv_nsec);
}
template<typename TimespecType>
inline bool operator>(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator>(const T& a, const T& b)
{
return a.tv_sec > b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_nsec > b.tv_nsec);
}
template<typename TimespecType>
inline bool operator<(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator<(const T& a, const T& b)
{
return a.tv_sec < b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_nsec < b.tv_nsec);
}
template<typename TimespecType>
inline bool operator<=(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator<=(const T& a, const T& b)
{
return a.tv_sec < b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_nsec <= b.tv_nsec);
}
template<typename TimespecType>
inline bool operator==(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator==(const T& a, const T& b)
{
return a.tv_sec == b.tv_sec && a.tv_nsec == b.tv_nsec;
}
template<typename TimespecType>
inline bool operator!=(const TimespecType& a, const TimespecType& b)
template<TimeSpecType T>
inline bool operator!=(const T& a, const T& b)
{
return a.tv_sec != b.tv_sec || a.tv_nsec != b.tv_nsec;
}