[Bf-blender-cvs] [58c456b12d4] master: Cycles: Fix compilation error when building without Glog and no C++11

[Sergey Sharybin]

Commit: 58c456b12d4162632ca4506b46e5e194e6f720be
Author: Sergey Sharybin
Date:   Wed Jul 5 12:01:12 2017 +0200
Branches: master
https://developer.blender.org/rB58c456b12d4162632ca4506b46e5e194e6f720be

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

===================================================================

M       intern/cycles/util/util_logging.h

===================================================================

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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs