blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cycles: Fix compilation error when building without Glog and no C++11

This commit is contained in:
Sergey Sharybin 2017-07-05 12:01:12 +02:00
parent 4d124418b7
commit 58c456b12d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/util/util_logging.h
View File

@ -19,28 +19,28 @@
#if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__)
# include <glog/logging.h>
#else
# include <iostream>
#endif
CCL_NAMESPACE_BEGIN
#if !defined(WITH_CYCLES_LOGGING) || defined(__KERNEL_GPU__)
class StubStream : public std::ostream {
public:
StubStream() : std::ostream(NULL) { }
class StubStream {
public:
template<class T>
StubStream& operator<<(const T&) {
return *this;
}
};
class LogMessageVoidify {
public:
LogMessageVoidify() { }
void operator&(::std::ostream&) { }
void operator&(StubStream&) { }
};
# define LOG_SUPPRESS() (true) ? (void) 0 : LogMessageVoidify() & StubStream()
# define LOG(severity) LOG_SUPPRESS()
# define VLOG(severity) LOG_SUPPRESS()
#endif
#define VLOG_ONCE(level, flag) if(!flag) flag = true, VLOG(level)