Mercurial > hg > orthanc

diff UnitTestsSources/VersionsTests.cpp @ 1545:33d34bc4ac15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix msvc warnings
author jodogne
date Thu, 13 Aug 2015 21:02:31 +0200
parents 766a42aac55d
children 1f5d6a2f9638
line wrap: on
line diff
--- a/UnitTestsSources/VersionsTests.cpp	Thu Aug 13 20:39:30 2015 +0200
+++ b/UnitTestsSources/VersionsTests.cpp	Thu Aug 13 21:02:31 2015 +0200
@@ -42,7 +42,10 @@
 #include <boost/version.hpp>
 #include <sqlite3.h>
 #include <lua.h>
+
+#if ORTHANC_SSL_ENABLED == 1
 #include <openssl/opensslv.h>
+#endif
 
 
 TEST(Versions, Zlib)
@@ -118,7 +121,7 @@
   curl_version_info_data * vinfo = curl_version_info(CURLVERSION_NOW);
 
   // Check that SSL support is enabled when required
-  bool curlSupportsSsl = vinfo->features & CURL_VERSION_SSL;
+  bool curlSupportsSsl = (vinfo->features & CURL_VERSION_SSL) != 0;
 
 #if ORTHANC_SSL_ENABLED == 0
   ASSERT_FALSE(curlSupportsSsl);
@@ -132,10 +135,13 @@
   ASSERT_STREQ("Lua 5.1.5", LUA_RELEASE);
 }
 
+
+#if ORTHANC_SSL_ENABLED == 1
 TEST(Version, OpenSslStatic)
 {
   ASSERT_EQ(0x1000204fL /* openssl-1.0.2d */, OPENSSL_VERSION_NUMBER);
 }
+#endif
 
 
 #include <json/version.h>