diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-06-26 11:26:56 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-06-26 11:26:56 +0300 |
| commit | 73eb1bfd55d51f1dfeb6c49560e0096c9214a105 (patch) | |
| tree | bc423c42b161db734a38b86500bbea4d00e58fe2 /intern/cycles/util | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Revert "Turned off clang warnings in third party includes."
This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52.
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, 0 insertions, 8 deletions
diff --git a/intern/cycles/util/util_image.h b/intern/cycles/util/util_image.h index 38694c87d0e..18876841b5b 100644 --- a/intern/cycles/util/util_image.h +++ b/intern/cycles/util/util_image.h @@ -19,11 +19,7 @@ /* 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 419a8010d5a..69bcbf80a78 100644 --- a/intern/cycles/util/util_param.h +++ b/intern/cycles/util/util_param.h @@ -20,13 +20,9 @@ /* 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 |