From 5f613f7b5da945909cdcb452ccec477e20074046 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 20 Feb 2016 13:45:01 +0500 Subject: OCIO: Disable the warnings related on C4251 Those warnings are trigerred by stl classes in OCIO's public interface. To quote MSDN: "C4251 can be ignored if you are deriving from a type in the Standard C++ Library" This is the only instance where those warnings hunts us, so for now we can keep it all local in intern/opencolorio but this might be changed in the future. --- intern/opencolorio/ocio_impl.cc | 7 +++++++ intern/opencolorio/ocio_impl_glsl.cc | 8 ++++++++ 2 files changed, 15 insertions(+) (limited to 'intern/opencolorio') diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index bf5590077ef..82536a74159 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -29,7 +29,14 @@ #include #include +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251 4275) +#endif #include +#ifdef _MSC_VER +# pragma warning(pop) +#endif using namespace OCIO_NAMESPACE; diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 42bd20d2eb1..bf91ea143da 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -39,7 +39,15 @@ #include "glew-mx.h" +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251 4275) +#endif #include +#ifdef _MSC_VER +# pragma warning(pop) +#endif + using namespace OCIO_NAMESPACE; -- cgit v1.2.3