Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed classes with undefined constructor.

Browse Source 
IterativeRobot and BinaryImage had no constructor
defined (and so would give linker errors).
Error just had an empty constructor defined,
so I switched to "=default".

Change-Id: Ia8efb4282928227878dfefeda58ccb8cf06aabb2
This commit is contained in:
James Kuszmaul
2015-07-17 14:48:50 -04:00
parent c776324f96
commit eb7d55fd59
6 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/wpilibC++/include/Error.h
View File

@@ -20,7 +20,7 @@ class Error {
public: public:
typedef int32_t Code; typedef int32_t Code;
Error(); Error() = default;
void Clone(const Error& error); void Clone(const Error& error);
Code GetCode() const; Code GetCode() const;
std::string GetMessage() const; std::string GetMessage() const;

2
wpilibc/wpilibC++/include/ErrorBase.h
View File

@@ -52,7 +52,7 @@
class ErrorBase { class ErrorBase {
// TODO: Consider initializing instance variables and cleanup in destructor // TODO: Consider initializing instance variables and cleanup in destructor
public: public:
ErrorBase(); ErrorBase() = default;
virtual ~ErrorBase() = default; virtual ~ErrorBase() = default;
virtual Error& GetError(); virtual Error& GetError();
virtual const Error& GetError() const; virtual const Error& GetError() const;

2
wpilibc/wpilibC++/src/Error.cpp
View File

@@ -17,8 +17,6 @@
#include "Timer.h" #include "Timer.h"
#include "Utility.h" #include "Utility.h"
Error::Error() {}
void Error::Clone(const Error& error) { void Error::Clone(const Error& error) {
m_code = error.m_code; m_code = error.m_code;
m_message = error.m_message; m_message = error.m_message;

4
wpilibc/wpilibC++/src/ErrorBase.cpp
View File

@@ -16,10 +16,6 @@
priority_mutex ErrorBase::_globalErrorMutex; priority_mutex ErrorBase::_globalErrorMutex;
Error ErrorBase::_globalError; Error ErrorBase::_globalError;
/**
* @brief Initialize the instance status to 0 for now.
*/
ErrorBase::ErrorBase() {}
/** /**
* @brief Retrieve the current error. * @brief Retrieve the current error.

2
wpilibc/wpilibC++Devices/include/IterativeRobot.h
View File

@@ -73,7 +73,7 @@ class IterativeRobot : public RobotBase {
virtual void Prestart(); virtual void Prestart();
virtual ~IterativeRobot() = default; virtual ~IterativeRobot() = default;
IterativeRobot(); IterativeRobot() = default;
private: private:
bool m_disabledInitialized = false; bool m_disabledInitialized = false;

1
wpilibc/wpilibC++Devices/include/Vision/BinaryImage.h
View File

@@ -18,7 +18,6 @@
class BinaryImage : public MonoImage { class BinaryImage : public MonoImage {
public: public:
BinaryImage();
virtual ~BinaryImage() = default; virtual ~BinaryImage() = default;
int GetNumberParticles(); int GetNumberParticles();
ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber); ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber);