diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-05-02 14:30:52 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-05-02 14:30:52 -0400 |
| commit | 1e3b332b0c6567a084a5a4501e82807aac0a8b22 (patch) | |
| tree | 01bb71f671cb8bcf296f1e8eceda0501e6b9f5e0 /cpp/include | |
| parent | ICE-6410 - Java error with empty truststore (diff) | |
| download | ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.bz2 ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.tar.xz ice-1e3b332b0c6567a084a5a4501e82807aac0a8b22.zip | |
Add support for VS 2015 RC (VC140)
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 3 | ||||
| -rw-r--r-- | cpp/include/IceUtil/PushDisableWarnings.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index b1403509b48..471fe9881c5 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -61,8 +61,7 @@ #endif -#if defined(ICE_CPP11) && !defined(_MSC_VER) -// Visual Studio does not support noexcept yet +#if defined(ICE_CPP11) && (!defined(_MSC_VER) || (_MSC_VER >= 1900)) # define ICE_NOEXCEPT noexcept # define ICE_NOEXCEPT_FALSE noexcept(false) #else diff --git a/cpp/include/IceUtil/PushDisableWarnings.h b/cpp/include/IceUtil/PushDisableWarnings.h index 3c27c4f7197..ab9692eb7d5 100644 --- a/cpp/include/IceUtil/PushDisableWarnings.h +++ b/cpp/include/IceUtil/PushDisableWarnings.h @@ -15,6 +15,10 @@ # pragma warning(disable:4250) // ... : inherits ... via dominance # pragma warning(disable:4251) // class ... needs to have dll-interface to be used by clients of class ... # pragma warning(disable:4512) // ... assignment operator could not be generated + +# if _MSC_VER >= 1900 +# pragma warning(disable:4275) // non dll-interface class ... used as base for dll-interface class ... +# endif #endif #if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) |