From 73eb1bfd55d51f1dfeb6c49560e0096c9214a105 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Tue, 26 Jun 2018 10:26:56 +0200 Subject: Revert "Turned off clang warnings in third party includes." This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52. --- intern/cycles/kernel/osl/osl_closures.cpp | 4 ---- intern/cycles/kernel/osl/osl_shader.cpp | 3 --- 2 files changed, 7 deletions(-) (limited to 'intern/cycles/kernel/osl') 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 #include -#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 -#pragma clang diagnostic pop #include "kernel/kernel_compat_cpu.h" #include "kernel/kernel_montecarlo.h" -- cgit v1.2.3