activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r946467 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf: internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp lang/ArrayPointer.h
Date Wed, 19 May 2010 22:33:30 GMT
Author: tabish
Date: Wed May 19 22:33:30 2010
New Revision: 946467

URL: http://svn.apache.org/viewvc?rev=946467&view=rev
Log:
Fix some windows compiler errors and warnings.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/ArrayPointer.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp?rev=946467&r1=946466&r2=946467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLServerSocketFactory.cpp
Wed May 19 22:33:30 2010
@@ -56,22 +56,22 @@ OpenSSLServerSocketFactory::~OpenSSLServ
 
 ////////////////////////////////////////////////////////////////////////////////
 ServerSocket* OpenSSLServerSocketFactory::createServerSocket() {
-
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port ) {
-
+ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port DECAF_UNUSED ) {
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port, int backlog ) {
-
+ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port DECAF_UNUSED, int
backlog DECAF_UNUSED ) {
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port, int backlog, const
InetAddress* address ) {
-
+ServerSocket* OpenSSLServerSocketFactory::createServerSocket( int port DECAF_UNUSED, int
backlog DECAF_UNUSED, const InetAddress* address DECAF_UNUSED ) {
+    return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/ArrayPointer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/ArrayPointer.h?rev=946467&r1=946466&r2=946467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/ArrayPointer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/ArrayPointer.h Wed May 19
22:33:30 2010
@@ -79,9 +79,10 @@ namespace lang {
 
     public:
 
-        typedef T* PointerType;          // type returned by operator->
-        typedef T& ReferenceType;        // type returned by operator*
-        typedef REFCOUNTER CounterType;  // Type of the Reference Counter
+        typedef T* PointerType;              // type returned by operator->
+        typedef T& ReferenceType;            // type returned by operator*
+        typedef const T& ConstReferenceType; // type returned by const operator*
+        typedef REFCOUNTER CounterType;      // Type of the Reference Counter
 
     public:
 
@@ -281,7 +282,7 @@ namespace lang {
 
             return this->array->value[index];
         }
-        const ReferenceType operator[]( int index ) const {
+        ConstReferenceType operator[]( int index ) const {
             if( this->array->value == NULL ) {
                 throw decaf::lang::exceptions::NullPointerException(
                     __FILE__, __LINE__, "ArrayPointer operator& - Pointee is NULL." );



Mime
View raw message