[Bf-blender-cvs] [d23a53c74af] master: Cycles: Fix/workaround for gcc-7.2

Sergey Sharybin noreply at git.blender.org
Mon Nov 12 12:16:14 CET 2018


Commit: d23a53c74af7601d45f90b182bcde035ef0d691c
Author: Sergey Sharybin
Date:   Mon Nov 12 12:10:33 2018 +0100
Branches: master
https://developer.blender.org/rBd23a53c74af7601d45f90b182bcde035ef0d691c

Cycles: Fix/workaround for gcc-7.2

For some reason when building with gcc-7.2 (which is default
in previous Ubuntu LTS) the guarded allocator is not being
properly instantiated.

Doesn't happen with newer version of gcc-7 which is 7.3, and
also doesn't happen with gcc-6 and gcc-8.

Would be nice to know what is wrong, but for the time being
committing workaround which keeps Blender users happy.

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

M	intern/cycles/util/util_ies.cpp

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

diff --git a/intern/cycles/util/util_ies.cpp b/intern/cycles/util/util_ies.cpp
index e068957325b..e1de2e0c6e4 100644
--- a/intern/cycles/util/util_ies.cpp
+++ b/intern/cycles/util/util_ies.cpp
@@ -21,6 +21,13 @@
 
 CCL_NAMESPACE_BEGIN
 
+// NOTE: For some reason gcc-7.2 does not instantiate this versio of allocator
+// gere (used in IESTextParser). Works fine for gcc-6, gcc-7.3 and gcc-8.
+//
+// TODO(sergey): Get to the root of this issue, or confirm this i a compiler
+// issue.
+template class GuardedAllocator<char>;
+
 bool IESFile::load(ustring ies)
 {
 	clear();



More information about the Bf-blender-cvs mailing list