From 75cc09a9e43b30ed62b5aae721580ef90de49312 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 29 Dec 2018 16:17:37 -0800
Subject: [PATCH] Revert "Suppress timeout message in C++ MotorSafety class
 (#1512)"

This reverts commit 300eeb330d78e2ef605d30644efbc4dd8bcdad61.
---
 wpilibc/src/main/native/cpp/MotorSafety.cpp       | 2 --
 wpilibc/src/main/native/include/frc/MotorSafety.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/wpilibc/src/main/native/cpp/MotorSafety.cpp b/wpilibc/src/main/native/cpp/MotorSafety.cpp
index 7bb1662e43..f9488ddc70 100644
--- a/wpilibc/src/main/native/cpp/MotorSafety.cpp
+++ b/wpilibc/src/main/native/cpp/MotorSafety.cpp
@@ -16,8 +16,6 @@
 
 using namespace frc;
 
-MotorSafety::MotorSafety() { m_watchdog.SuppressTimeoutMessage(true); }
-
 MotorSafety::MotorSafety(MotorSafety&& rhs)
     : ErrorBase(std::move(rhs)), m_enabled(std::move(rhs.m_enabled)) {
   m_watchdog = Watchdog(rhs.m_watchdog.GetTimeout(), [this] { TimeoutFunc(); });
diff --git a/wpilibc/src/main/native/include/frc/MotorSafety.h b/wpilibc/src/main/native/include/frc/MotorSafety.h
index b86e28a39d..513af392f5 100644
--- a/wpilibc/src/main/native/include/frc/MotorSafety.h
+++ b/wpilibc/src/main/native/include/frc/MotorSafety.h
@@ -25,7 +25,7 @@ namespace frc {
  */
 class MotorSafety : public ErrorBase {
  public:
-  MotorSafety();
+  MotorSafety() = default;
   virtual ~MotorSafety() = default;
 
   MotorSafety(MotorSafety&& rhs);