You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/05/19 22:03:10 UTC
svn commit: r946364 - in /activemq/activemq-cpp/trunk/activemq-cpp/src:
main/decaf/internal/net/ssl/openssl/ test/decaf/net/ssl/
Author: tabish
Date: Wed May 19 20:03:10 2010
New Revision: 946364
URL: http://svn.apache.org/viewvc?rev=946364&view=rev
Log:
Fix some compiler errors on platform without OpenSSL
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocket.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/ssl/SSLSocketFactoryTest.cpp
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.cpp?rev=946364&r1=946363&r2=946364&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.cpp Wed May 19 20:03:10 2010
@@ -80,6 +80,8 @@ namespace openssl {
#ifdef HAVE_OPENSSL
SSL_CTX* openSSLContext;
+#else
+ void* openSSLContext;
#endif
public:
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocket.cpp?rev=946364&r1=946363&r2=946364&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocket.cpp Wed May 19 20:03:10 2010
@@ -55,7 +55,10 @@ namespace openssl {
#ifdef HAVE_OPENSSL
SSL* ssl;
+#else
+ void* ssl;
#endif
+
bool needsClientAuth;
bool wantsClientAuth;
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp?rev=946364&r1=946363&r2=946364&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp Wed May 19 20:03:10 2010
@@ -59,6 +59,8 @@ namespace openssl {
#ifdef HAVE_OPENSSL
SSL* ssl;
+#else
+ void* ssl;
#endif
bool needsClientAuth;
bool wantsClientAuth;
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/ssl/SSLSocketFactoryTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/ssl/SSLSocketFactoryTest.cpp?rev=946364&r1=946363&r2=946364&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/ssl/SSLSocketFactoryTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/net/ssl/SSLSocketFactoryTest.cpp Wed May 19 20:03:10 2010
@@ -47,7 +47,7 @@ void SSLSocketFactoryTest::testGetDefaul
#else
- CPUNIT_ASSERT_THROW_MESSAGE(
+ CPPUNIT_ASSERT_THROW_MESSAGE(
"Should have thrown an IOException",
factory->createSocket(),
IOException );