drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox] Fix OxFS 2 Directory test

Browse Source
This commit is contained in:
Gary Talent
2018-06-06 23:30:57 -05:00
parent ea7cf59ec7
commit a6b9de9a59
11 changed files with 131 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deps/ox/src/ox/trace/trace.cpp vendored
View File

@@ -41,20 +41,13 @@ StdOutStream::StdOutStream(const char *file, int line, const char *ch, const cha
StdOutStream::~StdOutStream() {
#if defined(OX_USE_STDLIB)
std::cout << std::setw(50) << std::left << m_msg.ch.c_str() << '|';
std::cout << std::setw(60) << std::left << m_msg.msg.c_str() << '|';
std::cout << std::setw(53) << std::left << m_msg.ch.c_str() << '|';
std::cout << std::setw(65) << std::left << m_msg.msg.c_str() << '|';
std::cout << " " << m_msg.file.c_str() << ':' << m_msg.line << "\n";
#endif
}
NullStream::NullStream(const char*, int, const char*, const char*) {
}
NullStream::~NullStream() {
}
void logError(const char *file, int line, Error err) {
if (err) {
ErrorInfo ei(err);

15
deps/ox/src/ox/trace/trace.hpp vendored
View File

@@ -66,7 +66,7 @@ class StdOutStream {
~StdOutStream();
template<typename T>
inline StdOutStream &operator<<(const T &v) {
constexpr inline StdOutStream &operator<<(const T &v) {
m_msg.msg += " ";
m_msg.msg += v;
return *this;
@@ -78,20 +78,25 @@ class StdOutStream {
class NullStream {
public:
NullStream() = default;
constexpr NullStream() = default;
NullStream(const char *file, int line, const char *ch, const char *msg = "");
constexpr NullStream(const char*, int, const char*, const char* = "") {
}
~NullStream();
~NullStream() = default;
template<typename T>
inline NullStream &operator<<(const T&) {
constexpr inline NullStream &operator<<(const T&) {
return *this;
}
};
#ifdef DEBUG
using TraceStream = StdOutStream;
#else
using TraceStream = NullStream;
#endif
void logError(const char *file, int line, Error err);