forked from bartvdbraak/blender
Revert "Turned off clang warnings in third party includes."
This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52.
This commit is contained in:
parent
df237b964b
commit
73eb1bfd55
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user