diff --git a/wpilibc/wpilibC++/include/Error.h b/wpilibc/wpilibC++/include/Error.h index 243799c6c3..92dd1cf3a6 100644 --- a/wpilibc/wpilibC++/include/Error.h +++ b/wpilibc/wpilibC++/include/Error.h @@ -20,7 +20,7 @@ class Error { public: typedef int32_t Code; - Error(); + Error() = default; void Clone(const Error& error); Code GetCode() const; std::string GetMessage() const; diff --git a/wpilibc/wpilibC++/include/ErrorBase.h b/wpilibc/wpilibC++/include/ErrorBase.h index 4d0540f11b..066c64d9e6 100644 --- a/wpilibc/wpilibC++/include/ErrorBase.h +++ b/wpilibc/wpilibC++/include/ErrorBase.h @@ -52,7 +52,7 @@ class ErrorBase { // TODO: Consider initializing instance variables and cleanup in destructor public: - ErrorBase(); + ErrorBase() = default; virtual ~ErrorBase() = default; virtual Error& GetError(); virtual const Error& GetError() const; diff --git a/wpilibc/wpilibC++/src/Error.cpp b/wpilibc/wpilibC++/src/Error.cpp index ba6ee10590..1613c7f77a 100644 --- a/wpilibc/wpilibC++/src/Error.cpp +++ b/wpilibc/wpilibC++/src/Error.cpp @@ -17,8 +17,6 @@ #include "Timer.h" #include "Utility.h" -Error::Error() {} - void Error::Clone(const Error& error) { m_code = error.m_code; m_message = error.m_message; diff --git a/wpilibc/wpilibC++/src/ErrorBase.cpp b/wpilibc/wpilibC++/src/ErrorBase.cpp index 5e1506eb9d..aab413a9d7 100644 --- a/wpilibc/wpilibC++/src/ErrorBase.cpp +++ b/wpilibc/wpilibC++/src/ErrorBase.cpp @@ -16,10 +16,6 @@ priority_mutex ErrorBase::_globalErrorMutex; Error ErrorBase::_globalError; -/** - * @brief Initialize the instance status to 0 for now. - */ -ErrorBase::ErrorBase() {} /** * @brief Retrieve the current error. diff --git a/wpilibc/wpilibC++Devices/include/IterativeRobot.h b/wpilibc/wpilibC++Devices/include/IterativeRobot.h index 51387e50fb..d26ab70b39 100644 --- a/wpilibc/wpilibC++Devices/include/IterativeRobot.h +++ b/wpilibc/wpilibC++Devices/include/IterativeRobot.h @@ -73,7 +73,7 @@ class IterativeRobot : public RobotBase { virtual void Prestart(); virtual ~IterativeRobot() = default; - IterativeRobot(); + IterativeRobot() = default; private: bool m_disabledInitialized = false; diff --git a/wpilibc/wpilibC++Devices/include/Vision/BinaryImage.h b/wpilibc/wpilibC++Devices/include/Vision/BinaryImage.h index eda072c84a..8b7b25c060 100644 --- a/wpilibc/wpilibC++Devices/include/Vision/BinaryImage.h +++ b/wpilibc/wpilibC++Devices/include/Vision/BinaryImage.h @@ -18,7 +18,6 @@ class BinaryImage : public MonoImage { public: - BinaryImage(); virtual ~BinaryImage() = default; int GetNumberParticles(); ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber);