summaryrefslogtreecommitdiff
path: root/cpp/test/IceSSL/configuration/Client.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-03-16 16:11:24 +0100
committerJose <jose@zeroc.com>2017-03-16 16:11:24 +0100
commitc6f4057a8975e2312d82f22af59f2069d2b5e8ab (patch)
tree1312f2c5798821dd8b4c583f30983542d9528790 /cpp/test/IceSSL/configuration/Client.cpp
parentRemoved C# Ice.BatchRequestInterceptor (ICE-7662) (diff)
downloadice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.tar.bz2
ice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.tar.xz
ice-c6f4057a8975e2312d82f22af59f2069d2b5e8ab.zip
Fixed (ICE-7621) - Refactor IceSSL API to support multiple implementations
Diffstat (limited to 'cpp/test/IceSSL/configuration/Client.cpp')
-rw-r--r--cpp/test/IceSSL/configuration/Client.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/IceSSL/configuration/Client.cpp b/cpp/test/IceSSL/configuration/Client.cpp
index 931e45955da..1e416a55e57 100644
--- a/cpp/test/IceSSL/configuration/Client.cpp
+++ b/cpp/test/IceSSL/configuration/Client.cpp
@@ -12,6 +12,10 @@
#include <TestCommon.h>
#include <Test.h>
+#if defined(ICE_USE_OPENSSL)
+# include <IceSSL/OpenSSL.h>
+#endif
+
DEFINE_TEST("client")
using namespace std;
@@ -65,7 +69,9 @@ main(int argc, char* argv[])
// don't set Ice.Plugin.IceSSL to ensure the plugin is registered without
// the property setting.
//
+#if !defined(ICE_USE_OPENSSL)
Ice::registerIceSSL();
+#endif
int status;
Ice::CommunicatorPtr communicator;