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/kernel/osl | |
| parent | df237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff) | |
Revert "Turned off clang warnings in third party includes."
This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52.
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, 0 insertions, 7 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index e928006e41a..6a1e52d7d16 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -30,12 +30,8 @@ * 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 8757b9a748b..b7d1c629291 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -14,10 +14,7 @@ * 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" |