diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-12 14:10:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-12 14:16:07 +0300 |
| commit | d23a53c74af7601d45f90b182bcde035ef0d691c (patch) | |
| tree | bc4209ae7fde0a010c94986e398421c8e5ee1d0c /intern | |
| parent | e732c6af3bb5b5746c9232377ae2a4fd1178e752 (diff) | |
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.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_ies.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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(); |