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/kernel/osl | |
| 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/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 6a1e52d7d16..e928006e41a 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -30,8 +30,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" +#pragma clang diagnostic ignored "-Wexpansion-to-defined" #include <OSL/genclosure.h> #include <OSL/oslclosure.h> +#pragma clang diagnostic pop #include "kernel/osl/osl_closures.h" #include "kernel/osl/osl_shader.h" diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index b7d1c629291..8757b9a748b 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -14,7 +14,10 @@ * limitations under the License. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-register" #include <OSL/oslexec.h> +#pragma clang diagnostic pop #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_montecarlo.h" |