Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-10-02 03:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code to support VS2013

Browse Source
This commit is contained in:
gabi
2014-03-04 01:23:38 +02:00
parent 8b27eb0f01
commit 57fe78f1c6
7 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/c11log/details/blocking_queue.h
View File

@@ -58,8 +58,7 @@ public:
// If the queue is full, block the calling thread until there is room.
template<typename TT>
void push(TT&& item) {
constexpr std::chrono::hours one_hour(1);
while (!push(std::forward<TT>(item), one_hour));
while (!push(std::forward<TT>(item), std::chrono::hours(1)));
}
// Pop a copy of the front item in the queue into the given item ref.
@@ -86,8 +85,7 @@ public:
// Pop a copy of the front item in the queue into the given item ref.
// If the queue is empty, block the calling thread util there is item to pop.
void pop(T& item) {
constexpr std::chrono::hours one_hour(1);
while (!pop(item, one_hour));
while (!pop(item, std::chrono::hours(1)));
}
// Clear the queue

9
include/c11log/details/fast_oss.h
View File

@@ -15,9 +15,10 @@ public:
_str = other._str;
return *this;
}
const std::string& str_ref() const {
return _str;
std::ostringstream oss;
}
void clear() {
@@ -47,13 +48,15 @@ class fast_oss:public std::ostream {
public:
fast_oss():std::ostream(&_dev) {}
~fast_oss() = default;
fast_oss(const fast_oss& other):std::basic_ios<char>(), std::ostream(),_dev(other._dev) {}
fast_oss(const fast_oss& other) :std::ostream(&_dev), _dev(other._dev) {
}
fast_oss& operator=(const fast_oss& other) {
if(&other != this)
_dev = other._dev;
return *this;
}
const std::string& str_ref() const {
return _dev.str_ref();
}

17
include/c11log/details/os.h
View File

@@ -35,17 +35,16 @@ inline std::tm c11log::details::os::localtime()
inline bool operator==(const std::tm& tm1, const std::tm& tm2)
{
return (tm1.tm_sec == tm2.tm_sec &&
tm1.tm_min == tm2.tm_min &&
tm1.tm_hour == tm2.tm_hour &&
tm1.tm_mday == tm2.tm_mday &&
tm1.tm_mon == tm2.tm_mon &&
tm1.tm_year == tm2.tm_year &&
tm1.tm_isdst == tm2.tm_isdst &&
tm1.tm_gmtoff == tm2.tm_gmtoff);
return (tm1.tm_sec == tm2.tm_sec &&
tm1.tm_min == tm2.tm_min &&
tm1.tm_hour == tm2.tm_hour &&
tm1.tm_mday == tm2.tm_mday &&
tm1.tm_mon == tm2.tm_mon &&
tm1.tm_year == tm2.tm_year &&
tm1.tm_isdst == tm2.tm_isdst);
}
inline bool operator!=(const std::tm& tm1, const std::tm& tm2)
{
return !(tm1==tm2);
return !(tm1==tm2);
}