[Bf-blender-cvs] [ed13a2b1675] cycles-x: Cleanup: Cycles X compilation warnings

[Sergey Sharybin]

Commit: ed13a2b167516c3d230beeef9ec633832bded6d0
Author: Sergey Sharybin
Date:   Thu Jul 15 10:05:18 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBed13a2b167516c3d230beeef9ec633832bded6d0

Cleanup: Cycles X compilation warnings

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

M	intern/cycles/device/cuda/device_impl.cpp
M	intern/cycles/render/shader.cpp

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

diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp
index 5aa3b3e5014..2ea465fc3b1 100644
--- a/intern/cycles/device/cuda/device_impl.cpp
+++ b/intern/cycles/device/cuda/device_impl.cpp
@@ -234,7 +234,7 @@ string CUDADevice::compile_kernel_get_common_cflags(const uint kernel_features)
       machine,
       include_path.c_str());
   if (use_adaptive_compilation()) {
-    cflags += " -D__KERNEL_FEATURES__=" + string_printf("%d", kernel_features);
+    cflags += " -D__KERNEL_FEATURES__=" + to_string(kernel_features);
   }
   const char *extra_cflags = getenv("CYCLES_CUDA_EXTRA_CFLAGS");
   if (extra_cflags) {
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 23215bd6e53..f6b23606e58 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -486,7 +486,7 @@ void ShaderManager::device_update(Device *device,
   device_update_specific(device, dscene, scene, progress);
 }
 
-void ShaderManager::device_update_common(Device *device,
+void ShaderManager::device_update_common(Device * /*device*/,
                                          DeviceScene *dscene,
                                          Scene *scene,
                                          Progress & /*progress*/)