summaryrefslogtreecommitdiff
path: root/cpp/test/IceSSL/configuration/AllTests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceSSL/configuration/AllTests.cpp')
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 6c5cd2c7099..231cba6444c 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -16,6 +16,10 @@
#include <Ice/UniqueRef.h>
+#ifdef _MSC_VER
+# pragma warning(disable:4189) // 'elCapitanUpdate2OrLower': local variable is initialized but not referenced
+#endif
+
#if defined(__APPLE__)
# include <sys/sysctl.h>
# if TARGET_OS_IPHONE != 0
@@ -251,7 +255,7 @@ public:
do
{
if((next = CertFindCertificateInStore(p12, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0,
- CERT_FIND_ANY, 0, next)))
+ CERT_FIND_ANY, 0, next)) != 0)
{
if(CertAddCertificateContextToStore(_store, next, CERT_STORE_ADD_ALWAYS, &newCert))
{