diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-10-31 15:03:01 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-10-31 15:03:01 -0400 |
| commit | 1307d3d1626ca3410cb980c1cd4bdad0f0673aac (patch) | |
| tree | dddc4eff26a445eafa5916b6a567f06d1c5a2b0c /cpp/include/IceSSL/IceSSL.h | |
| parent | Fix demo builds caused by ICE-5813 (diff) | |
| download | ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.tar.bz2 ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.tar.xz ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.zip | |
New IceUtil headers to push and pop pragma disable warning with MSVC and GCC
Diffstat (limited to 'cpp/include/IceSSL/IceSSL.h')
| -rw-r--r-- | cpp/include/IceSSL/IceSSL.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index f1b37a6e6c2..cf3b265b12b 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -10,11 +10,13 @@ #ifndef ICE_SSL_ICE_SSL_H #define ICE_SSL_ICE_SSL_H +#include <IceUtil/PushDisableWarnings.h> #include <IceUtil/Config.h> #ifndef ICE_OS_WINRT # include <IceSSL/Plugin.h> #endif #include <IceSSL/EndpointInfo.h> #include <IceSSL/ConnectionInfo.h> +#include <IceUtil/PopDisableWarnings.h> #endif |