[Bf-blender-cvs] [b90d849] master: Cycles: Fix for the MSVC which doesn't have default osteram constructor

Sergey Sharybin noreply at git.blender.org
Thu Sep 25 20:27:11 CEST 2014


Commit: b90d849171e42513da98c9919d37048d652ca723
Author: Sergey Sharybin
Date:   Fri Sep 26 00:26:37 2014 +0600
Branches: master
https://developer.blender.org/rBb90d849171e42513da98c9919d37048d652ca723

Cycles: Fix for the MSVC which doesn't have default osteram constructor

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

M	intern/cycles/util/util_logging.h

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

diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h
index 2bd0fac..991789e 100644
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -28,7 +28,7 @@ CCL_NAMESPACE_BEGIN
 #if !defined(WITH_CYCLES_LOGGING) || defined(__KERNEL_GPU__)
 class StubStream : public std::ostream {
  public:
-	StubStream () { }
+	StubStream() : std::ostream(NULL) { }
 };
 
 class LogMessageVoidify {




More information about the Bf-blender-cvs mailing list