From 4cd8a56672c28b48b01504bfa9477f625ada2f61 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 24 Aug 2019 21:13:29 -0700
Subject: [PATCH] TimedRobot.cpp: Fix deprecation warning (#1846)

For both TimedRobot and IterativeRobotBase, use delegating constructors
to reduce code duplication.
---
 wpilibc/src/main/native/cpp/IterativeRobotBase.cpp | 3 +--
 wpilibc/src/main/native/cpp/TimedRobot.cpp         | 9 +--------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
index ea52dc5342..73d4c1537a 100644
--- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
+++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp
@@ -24,8 +24,7 @@
 using namespace frc;
 
 IterativeRobotBase::IterativeRobotBase(double period)
-    : m_period(period),
-      m_watchdog(period, [this] { PrintLoopOverrunMessage(); }) {}
+    : IterativeRobotBase(units::second_t(period)) {}
 
 IterativeRobotBase::IterativeRobotBase(units::second_t period)
     : m_period(period.to<double>()),
diff --git a/wpilibc/src/main/native/cpp/TimedRobot.cpp b/wpilibc/src/main/native/cpp/TimedRobot.cpp
index 7eed084a6d..fefd1e098b 100644
--- a/wpilibc/src/main/native/cpp/TimedRobot.cpp
+++ b/wpilibc/src/main/native/cpp/TimedRobot.cpp
@@ -47,14 +47,7 @@ units::second_t TimedRobot::GetPeriod() const {
   return units::second_t(m_period);
 }
 
-TimedRobot::TimedRobot(double period) : IterativeRobotBase(period) {
-  int32_t status = 0;
-  m_notifier = HAL_InitializeNotifier(&status);
-  wpi_setErrorWithContext(status, HAL_GetErrorMessage(status));
-
-  HAL_Report(HALUsageReporting::kResourceType_Framework,
-             HALUsageReporting::kFramework_Timed);
-}
+TimedRobot::TimedRobot(double period) : TimedRobot(units::second_t(period)) {}
 
 TimedRobot::TimedRobot(units::second_t period) : IterativeRobotBase(period) {
   int32_t status = 0;