Major formatting changes (breaks diffs). No code changes.

The changes made in this commit do not affect any actual code,
    they are purely aesthetic. I ran clang-format with google style
    over all .h/.cpp files in wpilibc that weren't in wpilibC++Sim
    or gtest, and the eclipse formatter over all of the Java files
    using the Google eclipse formatting configuration.

Change-Id: I9627bca0bc103c398ecc1c5ba17467193291ae63
This commit is contained in:
James Kuszmaul
2015-06-25 15:07:55 -04:00
parent bd64d9a7ef
commit 7eb8550bdb
470 changed files with 89798 additions and 77287 deletions

View File

@@ -1,5 +1,6 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) FIRST 2008. All Rights Reserved. */
/* Copyright (c) FIRST 2008. All Rights Reserved.
*/
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
/*----------------------------------------------------------------------------*/
@@ -19,93 +20,79 @@
bool Error::m_suspendOnErrorEnabled = false;
Error::Error()
: m_code(0)
, m_lineNumber(0)
, m_originatingObject(NULL)
, m_timestamp (0.0)
{}
: m_code(0), m_lineNumber(0), m_originatingObject(NULL), m_timestamp(0.0) {}
Error::~Error()
{}
Error::~Error() {}
void Error::Clone(Error &error)
{
m_code = error.m_code;
m_message = error.m_message;
m_filename = error.m_filename;
m_function = error.m_function;
m_lineNumber = error.m_lineNumber;
m_originatingObject = error.m_originatingObject;
m_timestamp = error.m_timestamp;
void Error::Clone(Error& error) {
m_code = error.m_code;
m_message = error.m_message;
m_filename = error.m_filename;
m_function = error.m_function;
m_lineNumber = error.m_lineNumber;
m_originatingObject = error.m_originatingObject;
m_timestamp = error.m_timestamp;
}
Error::Code Error::GetCode() const
{ return m_code; }
Error::Code Error::GetCode() const { return m_code; }
const char * Error::GetMessage() const
{ return m_message.c_str(); }
const char* Error::GetMessage() const { return m_message.c_str(); }
const char * Error::GetFilename() const
{ return m_filename.c_str(); }
const char* Error::GetFilename() const { return m_filename.c_str(); }
const char * Error::GetFunction() const
{ return m_function.c_str(); }
const char* Error::GetFunction() const { return m_function.c_str(); }
uint32_t Error::GetLineNumber() const
{ return m_lineNumber; }
uint32_t Error::GetLineNumber() const { return m_lineNumber; }
const ErrorBase* Error::GetOriginatingObject() const
{ return m_originatingObject; }
double Error::GetTimestamp() const
{ return m_timestamp; }
void Error::Set(Code code, const char* contextMessage, const char* filename, const char* function, uint32_t lineNumber, const ErrorBase* originatingObject)
{
bool report = true;
if(code == m_code && GetTime() - m_timestamp < 1)
{
report = false;
}
m_code = code;
m_message = contextMessage;
m_filename = filename;
m_function = function;
m_lineNumber = lineNumber;
m_originatingObject = originatingObject;
if(report)
{
m_timestamp = GetTime();
Report();
}
if (m_suspendOnErrorEnabled) suspendTask(0);
const ErrorBase* Error::GetOriginatingObject() const {
return m_originatingObject;
}
void Error::Report()
{
std::stringstream errorStream;
double Error::GetTimestamp() const { return m_timestamp; }
errorStream << "Error on line " << m_lineNumber << " ";
errorStream << "of "<< basename(m_filename.c_str()) << ": ";
errorStream << m_message << std::endl;
errorStream << GetStackTrace(4);
void Error::Set(Code code, const char* contextMessage, const char* filename,
const char* function, uint32_t lineNumber,
const ErrorBase* originatingObject) {
bool report = true;
std::string error = errorStream.str();
if (code == m_code && GetTime() - m_timestamp < 1) {
report = false;
}
DriverStation::ReportError(error);
m_code = code;
m_message = contextMessage;
m_filename = filename;
m_function = function;
m_lineNumber = lineNumber;
m_originatingObject = originatingObject;
if (report) {
m_timestamp = GetTime();
Report();
}
if (m_suspendOnErrorEnabled) suspendTask(0);
}
void Error::Clear()
{
m_code = 0;
m_message = "";
m_filename = "";
m_function = "";
m_lineNumber = 0;
m_originatingObject = NULL;
m_timestamp = 0.0;
void Error::Report() {
std::stringstream errorStream;
errorStream << "Error on line " << m_lineNumber << " ";
errorStream << "of " << basename(m_filename.c_str()) << ": ";
errorStream << m_message << std::endl;
errorStream << GetStackTrace(4);
std::string error = errorStream.str();
DriverStation::ReportError(error);
}
void Error::Clear() {
m_code = 0;
m_message = "";
m_filename = "";
m_function = "";
m_lineNumber = 0;
m_originatingObject = NULL;
m_timestamp = 0.0;
}