[Bf-blender-cvs] [faf5f7b63d5] master: Cleanup: fix compiler warning after recent changes

[Brecht Van Lommel]

Commit: faf5f7b63d52f22b867619f4b38e5346fee56b37
Author: Brecht Van Lommel
Date:   Wed Jun 10 20:34:01 2020 +0200
Branches: master
https://developer.blender.org/rBfaf5f7b63d52f22b867619f4b38e5346fee56b37

Cleanup: fix compiler warning after recent changes

It would be good to use override for all member functions, but doing it for
only somes generates compiler warning.

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

M	intern/cycles/device/device_multi.cpp

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

diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index ef1687ddd3a..020b9e10e60 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -242,7 +242,7 @@ class MultiDevice : public Device {
     return devices.front().device->osl_memory();
   }
 
-  bool is_resident(device_ptr key, Device *sub_device) override
+  bool is_resident(device_ptr key, Device *sub_device)
   {
     foreach (SubDevice &sub, devices) {
       if (sub.device == sub_device) {