diff options
Diffstat (limited to 'intern/cycles/device/cpu/kernel_thread_globals.cpp')
-rw-r--r-- | intern/cycles/device/cpu/kernel_thread_globals.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/cpu/kernel_thread_globals.cpp b/intern/cycles/device/cpu/kernel_thread_globals.cpp index 988b00cd1f0..44735beb88d 100644 --- a/intern/cycles/device/cpu/kernel_thread_globals.cpp +++ b/intern/cycles/device/cpu/kernel_thread_globals.cpp @@ -25,10 +25,10 @@ CCL_NAMESPACE_BEGIN -CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobals &kernel_globals, +CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobalsCPU &kernel_globals, void *osl_globals_memory, Profiler &cpu_profiler) - : KernelGlobals(kernel_globals), cpu_profiler_(cpu_profiler) + : KernelGlobalsCPU(kernel_globals), cpu_profiler_(cpu_profiler) { reset_runtime_memory(); @@ -40,7 +40,7 @@ CPUKernelThreadGlobals::CPUKernelThreadGlobals(const KernelGlobals &kernel_globa } CPUKernelThreadGlobals::CPUKernelThreadGlobals(CPUKernelThreadGlobals &&other) noexcept - : KernelGlobals(std::move(other)), cpu_profiler_(other.cpu_profiler_) + : KernelGlobalsCPU(std::move(other)), cpu_profiler_(other.cpu_profiler_) { other.reset_runtime_memory(); } @@ -58,7 +58,7 @@ CPUKernelThreadGlobals &CPUKernelThreadGlobals::operator=(CPUKernelThreadGlobals return *this; } - *static_cast<KernelGlobals *>(this) = *static_cast<KernelGlobals *>(&other); + *static_cast<KernelGlobalsCPU *>(this) = *static_cast<KernelGlobalsCPU *>(&other); other.reset_runtime_memory(); |