diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 11:45:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:11 +0300 |
| commit | 5f613f7b5da945909cdcb452ccec477e20074046 (patch) | |
| tree | ed2c8c4dcf7a71bdb3ed9712a813a37f7a50e5c1 /intern/opencolorio | |
| parent | b2655167c61550095be1713430ad28f92a00634e (diff) | |
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.
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/ocio_impl.cc | 7 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 8 |
2 files changed, 15 insertions, 0 deletions
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 <sstream> #include <string.h> +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251 4275) +#endif #include <OpenColorIO/OpenColorIO.h> +#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 <OpenColorIO/OpenColorIO.h> +#ifdef _MSC_VER +# pragma warning(pop) +#endif + using namespace OCIO_NAMESPACE; |