Error.cpp: Use llvm path function instead of OS basename.

This fixes an issue with the mac build.
This commit is contained in:
Peter Johnson
2017-08-20 09:56:39 -07:00
parent 5c0b08f4f5
commit 909e6c4857

View File

@@ -10,6 +10,7 @@
#include "DriverStation.h"
#include "Timer.h"
#include "Utility.h"
#include "llvm/Path.h"
#include "llvm/SmallString.h"
#include "llvm/raw_ostream.h"
@@ -66,17 +67,7 @@ void Error::Set(Code code, llvm::StringRef contextMessage,
void Error::Report() {
llvm::SmallString<128> buf;
llvm::raw_svector_ostream locStream(buf);
locStream << m_function << " [";
#if defined(_WIN32)
const int MAX_DIR = 100;
char basename[MAX_DIR];
_splitpath_s(m_filename.c_str(), nullptr, 0, basename, MAX_DIR, nullptr, 0,
nullptr, 0);
locStream << basename;
#else
locStream << basename(m_filename.c_str());
#endif
locStream << m_function << " [" << llvm::sys::path::filename(m_filename);
locStream << ":" << m_lineNumber << "]";
DriverStation::ReportError(true, m_code, m_message, locStream.str(),