diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-06-26 00:02:01 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-06-26 00:02:01 +0300 |
| commit | d53093953f8f3b58600cb19020ecbe0b5f254b52 (patch) | |
| tree | 44106bd380162251a755b82e490ffd1371e09cf5 /intern/cycles/util | |
| parent | 8a7f317666caa41aad0428b5ed3f399cdfbbd816 (diff) | |
Turned off clang warnings in third party includes.
The latest clang compiler (at least the one in Xcode 9.4.1) warns about the register keyword and macro expansions using defined().
Since these warnings come from third party code, we can't address them directly in Blender. Silencing them via #pramgas will
at least keep the warnings during a build down to the ones that are relevant to Blender code.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_image.h | 4 | ||||
| -rw-r--r-- | intern/cycles/util/util_param.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/util_image.h index 18876841b5b..38694c87d0e 100644 --- a/intern/cycles/util/util_image.h +++ b/intern/cycles/util/util_image.h @@ -19,7 +19,11 @@ /* OpenImageIO is used for all image file reading and writing. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/imageio.h> +#pragma clang diagnostic pop #include "util/util_vector.h" diff --git a/intern/cycles/util/util_param.h b/intern/cycles/util/util_param.h index 69bcbf80a78..419a8010d5a 100644 --- a/intern/cycles/util/util_param.h +++ b/intern/cycles/util/util_param.h @@ -20,9 +20,13 @@ /* Parameter value lists from OpenImageIO are used to store custom properties * on various data, which can then later be used in shaders. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OpenImageIO/paramlist.h> #include <OpenImageIO/typedesc.h> #include <OpenImageIO/ustring.h> +#pragma clang diagnostic pop CCL_NAMESPACE_BEGIN |