From 73eb1bfd55d51f1dfeb6c49560e0096c9214a105 Mon Sep 17 00:00:00 2001
From: Stefan Werner <stefan.werner@tangent-animation.com>
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/device/device_cpu.cpp                 | 3 ---
 intern/cycles/kernel/osl/osl_closures.cpp           | 4 ----
 intern/cycles/kernel/osl/osl_shader.cpp             | 3 ---
 intern/cycles/render/shader.h                       | 3 ---
 intern/cycles/util/util_image.h                     | 4 ----
 intern/cycles/util/util_param.h                     | 4 ----
 source/blender/imbuf/intern/openexr/openexr_api.cpp | 4 ----
 7 files changed, 25 deletions(-)

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 3b0d0fb9806..6be60f8bbb6 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -21,10 +21,7 @@
 #ifdef WITH_OSL
 /* So no context pollution happens from indirectly included windows.h */
 #  include "util/util_windows.h"
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-register"
 #  include <OSL/oslexec.h>
-#  pragma clang diagnostic pop
 #endif
 
 #include "device/device.h"
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"
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index dd346ef5795..0353da90013 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -20,10 +20,7 @@
 #ifdef WITH_OSL
 /* So no context pollution happens from indirectly included windows.h */
 #  include "util/util_windows.h"
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-register"
 #  include <OSL/oslexec.h>
-#  pragma clang diagnostic pop
 #endif
 
 #include "render/attribute.h"
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
 
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 13c033523fa..a52ae75e87b 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -40,9 +40,6 @@
 #include <algorithm>
 #include <iostream>
 
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-register"
 #include <half.h>
 #include <Iex.h>
 #include <ImfVersion.h>
@@ -67,7 +64,6 @@
 #include <ImfTiledOutputPart.h>
 #include <ImfPartType.h>
 #include <ImfPartHelper.h>
-#pragma clang diagnostic pop
 
 #include "DNA_scene_types.h" /* For OpenEXR compression constants */
 
-- 
cgit v1.2.3