Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Twine for error message inputs.

Browse Source
This commit is contained in:
Peter Johnson
2017-12-01 21:31:35 -08:00
parent ab137abab5
commit fe53dd2f28
6 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibc/src/main/native/cpp/Error.cpp
View File

@@ -43,7 +43,7 @@ const ErrorBase* Error::GetOriginatingObject() const {
double Error::GetTimestamp() const { return m_timestamp; }
void Error::Set(Code code, llvm::StringRef contextMessage,
void Error::Set(Code code, const llvm::Twine& contextMessage,
llvm::StringRef filename, llvm::StringRef function,
int lineNumber, const ErrorBase* originatingObject) {
bool report = true;
@@ -53,7 +53,7 @@ void Error::Set(Code code, llvm::StringRef contextMessage,
}
m_code = code;
m_message = contextMessage;
m_message = contextMessage.str();
m_filename = filename;
m_function = function;
m_lineNumber = lineNumber;
@@ -66,13 +66,11 @@ void Error::Set(Code code, llvm::StringRef contextMessage,
}
void Error::Report() {
llvm::SmallString<128> buf;
llvm::raw_svector_ostream locStream(buf);
locStream << m_function << " [" << llvm::sys::path::filename(m_filename);
locStream << ":" << m_lineNumber << "]";
DriverStation::ReportError(true, m_code, m_message, locStream.str(),
GetStackTrace(4));
DriverStation::ReportError(
true, m_code, m_message,
m_function + llvm::Twine(" [") + llvm::sys::path::filename(m_filename) +
llvm::Twine(':') + llvm::Twine(m_lineNumber) + llvm::Twine(']'),
GetStackTrace(4));
}
void Error::Clear() {