activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r952788 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
Date Tue, 08 Jun 2010 19:39:43 GMT
Author: tabish
Date: Tue Jun  8 19:39:43 2010
New Revision: 952788

URL: http://svn.apache.org/viewvc?rev=952788&view=rev
Log:
Fix a warning and work around an odd compiler error on Mac

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp

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=952788&r1=952787&r2=952788&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
Tue Jun  8 19:39:43 2010
@@ -75,7 +75,7 @@ namespace openssl {
         }
 
 #ifdef HAVE_OPENSSL
-        static int verifyCallback( int verified, X509_STORE_CTX* store ) {
+        static int verifyCallback( int verified, X509_STORE_CTX* store DECAF_UNUSED ) {
 
             if( !verified ) {
 
@@ -649,7 +649,7 @@ void OpenSSLSocket::verifyServerCert( co
 
         if( apr_strnatcmp( "subjectAltName", extensionName ) == 0 ) {
 
-            const X509V3_EXT_METHOD* method = X509V3_EXT_get( extension );
+            X509V3_EXT_METHOD* method = (X509V3_EXT_METHOD*)X509V3_EXT_get( extension );
             if( method == NULL ) {
                 break;
             }



Mime
View raw message