oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Chrono: override operator+ and operator-

Browse Source 
Make sure we return the correct type.  This obsoletes the cast
constructor trick.
This commit is contained in:
Max Kellermann 2014-08-28 07:12:58 +02:00
parent 26f2d7fbae
commit 854258f376
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Chrono.hxx
View File

@ -21,6 +21,7 @@
#define MPD_CHRONO_HXX
#include <chrono>
#include <utility>
#include <cstdint>
/**
@ -37,13 +38,9 @@ public:
template<typename T>
explicit constexpr SongTime(T t):Base(t) {}
/**
* This constructor allows implicit conversion from the base
* class to this class. It is necessary because all of
* std::chrono::duration's operators return another
* std::chrono::duration and not an instance of this class.
*/
constexpr SongTime(Base b):Base(b) {}
static constexpr SongTime zero() {
return SongTime(Base::zero());
}
static constexpr SongTime FromS(unsigned s) {
return SongTime(rep(s) * 1000);
@ -81,6 +78,14 @@ public:
constexpr bool IsPositive() const {
return count() > 0;
}
constexpr SongTime operator+(const SongTime &other) const {
return SongTime(*(const Base *)this + (const Base &)other);
}
constexpr SongTime operator-(const SongTime &other) const {
return SongTime(*(const Base *)this - (const Base &)other);
}
};
/**
@ -97,13 +102,9 @@ public:
template<typename T>
explicit constexpr SignedSongTime(T t):Base(t) {}
/**
* This constructor allows implicit conversion from the base
* class to this class. It is necessary because all of
* std::chrono::duration's operators return another
* std::chrono::duration and not an instance of this class.
*/
constexpr SignedSongTime(Base b):Base(b) {}
static constexpr SignedSongTime zero() {
return SignedSongTime(Base::zero());
}
static constexpr SignedSongTime FromS(int s) {
return SignedSongTime(rep(s) * 1000);
@ -145,6 +146,14 @@ public:
constexpr bool IsNegative() const {
return count() < 0;
}
constexpr SignedSongTime operator+(const SignedSongTime &other) const {
return SignedSongTime(*(const Base *)this + (const Base &)other);
}
constexpr SignedSongTime operator-(const SignedSongTime &other) const {
return SignedSongTime(*(const Base *)this - (const Base &)other);
}
};
#endif