diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
commit | e9bbfd0c8c7a508d220bf355722ff03f91e93183 (patch) | |
tree | 1230f26bc82f24547aeccbaa7fcd6d3db2655fd3 /intern/cycles/device/hip/device.cpp | |
parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/device/hip/device.cpp')
-rw-r--r-- | intern/cycles/device/hip/device.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/hip/device.cpp b/intern/cycles/device/hip/device.cpp index 90028ac7f10..f71732d14bb 100644 --- a/intern/cycles/device/hip/device.cpp +++ b/intern/cycles/device/hip/device.cpp @@ -16,14 +16,14 @@ #include "device/hip/device.h" -#include "util/util_logging.h" +#include "util/log.h" #ifdef WITH_HIP # include "device/device.h" # include "device/hip/device_impl.h" -# include "util/util_string.h" -# include "util/util_windows.h" +# include "util/string.h" +# include "util/windows.h" #endif /* WITH_HIP */ CCL_NAMESPACE_BEGIN |