diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-05 13:01:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-05 13:01:12 +0300 |
| commit | 58c456b12d4162632ca4506b46e5e194e6f720be (patch) | |
| tree | 995a10d9625e2a4decda1681fe2a75fa1ae0d23b /intern | |
| parent | 4d124418b7e471b314a19c142a54b6a6bb0088f0 (diff) | |
Cycles: Fix compilation error when building without Glog and no C++11
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_logging.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h index ecf9c9cfee0..6380cb13a9b 100644 --- a/intern/cycles/util/util_logging.h +++ b/intern/cycles/util/util_logging.h @@ -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) |