commit e7bdd47fa2bc6f91b74b3c56313578e8054d5678
author Austin Schuh <austin.linux@gmail.com> Tue Sep 26 23:50:06 2017 -0700
committer Gerrit Code Review <gerrit@robotics.mvla.net> Tue Sep 26 23:50:06 2017 -0700
tree f3f6ebee08db5570701d3ddebe1401e86f076f3b
parent 526ebd2c1da799e9f931867618c89b83a732fdb3
parent 22202939baf6e4f409ea23b1cc8388aae13bc40a

Merge "Fix integer discrepancy in superstructure_lib_test"

y2017/control_loops/superstructure/superstructure_lib_test.cc

diff --git a/y2017/control_loops/superstructure/superstructure_lib_test.cc b/y2017/control_loops/superstructure/superstructure_lib_test.cc
index 513e2f2..e4e391c 100644
--- a/y2017/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2017/control_loops/superstructure/superstructure_lib_test.cc
@@ -1159,8 +1159,9 @@
               chrono::milliseconds(1050));
   EXPECT_TRUE(unstuck_detection_time - unstuck_start_time >
               chrono::milliseconds(400));
-  LOG(INFO, "Unstuck time is %ldms",
-      (unstuck_detection_time - unstuck_start_time).count() / 1000000);
+  LOG(INFO, "Unstuck time is %" PRId64 "ms",
+      static_cast<int64_t>(
+          (unstuck_detection_time - unstuck_start_time).count() / 1000000));
 
   // Now, make sure it transitions to stuck again after a delay.
   const auto restuck_start_time = monotonic_clock::now();