Commit b26d15c9 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Merge branch 'beta' into stable

parents 401d3567 b9e991a3
......@@ -371,7 +371,7 @@ class VirtualCanDriver : public uavcan::ICanDriver,
void waitFor(uavcan::MonotonicDuration duration)
static const unsigned NsPerSec = 1000000000;
static const int NsPerSec = 1000000000;
if (duration.isPositive()) {
auto abstime = ::timespec();
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment