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

<limits> from STL is not required

Browse Source
This commit is contained in:
Pavel Kirienko
2014-05-05 15:51:49 +04:00
parent 1a9e1d8202
commit 08cea4aacd
11 changed files with 162 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/time.hpp
+3 -4
View File
@@ -4,7 +4,6 @@
#pragma once
#include <limits>
#include <uavcan/stdint.hpp>
#include <uavcan/impl_constants.hpp>
#include <uavcan/util/templates.hpp>
@@ -29,7 +28,7 @@ protected:
}
public:
static D getInfinite() { return fromUSec(std::numeric_limits<int64_t>::max()); }
static D getInfinite() { return fromUSec(NumericTraits<int64_t>::max()); }
static D fromUSec(int64_t us)
{
@@ -106,7 +105,7 @@ protected:
}
public:
static T getMax() { return fromUSec(std::numeric_limits<uint64_t>::max()); }
static T getMax() { return fromUSec(NumericTraits<uint64_t>::max()); }
static T fromUSec(uint64_t us)
{
@@ -142,7 +141,7 @@ public:
{
if (uint64_t(usec_ + r.toUSec()) < usec_)
{
return fromUSec(std::numeric_limits<uint64_t>::max());
return fromUSec(NumericTraits<uint64_t>::max());
}
}
return fromUSec(usec_ + r.toUSec());