fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 15:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Destructor fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-18 23:44:31 +04:00
parent 707c3e3ed1
commit dfc69b4b5f
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/time.hpp
+10 -4
View File
@@ -20,13 +20,16 @@ class DurationBase
{
int64_t usec_;
public:
protected:
~DurationBase() { }
DurationBase()
: usec_(0)
{
StaticAssert<(sizeof(D) == 8)>::check();
}
public:
static D getInfinite() { return fromUSec(std::numeric_limits<int64_t>::max()); }
static D fromUSec(int64_t us)
@@ -93,7 +96,9 @@ class TimeBase
{
uint64_t usec_;
public:
protected:
~TimeBase() { }
TimeBase()
: usec_(0)
{
@@ -101,6 +106,7 @@ public:
StaticAssert<(sizeof(D) == 8)>::check();
}
public:
static T getMax() { return fromUSec(std::numeric_limits<uint64_t>::max()); }
static T fromUSec(uint64_t us)
@@ -256,7 +262,7 @@ std::string TimeBase<T, D>::toString() const
template <typename Stream, typename D>
UAVCAN_EXPORT
Stream& operator<<(Stream& s, DurationBase<D> d)
Stream& operator<<(Stream& s, const DurationBase<D>& d)
{
char buf[DurationBase<D>::StringBufSize];
d.toString(buf);
@@ -266,7 +272,7 @@ Stream& operator<<(Stream& s, DurationBase<D> d)
template <typename Stream, typename T, typename D>
UAVCAN_EXPORT
Stream& operator<<(Stream& s, TimeBase<T, D> t)
Stream& operator<<(Stream& s, const TimeBase<T, D>& t)
{
char buf[TimeBase<T, D>::StringBufSize];
t.toString(buf);