Return-Path: 
 <commits-return-15222-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 43320 invoked from network); 17 Dec 2010 16:56:20 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 17 Dec 2010 16:56:20 -0000
Received: (qmail 62707 invoked by uid 500); 17 Dec 2010 16:56:20 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 62641 invoked by uid 500); 17 Dec 2010 16:56:20 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 62634 invoked by uid 99); 17 Dec 2010 16:56:19 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Dec 2010 16:56:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Dec 2010 16:56:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EA1BC23889B2; Fri, 17 Dec 2010 16:55:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1050448 - in
 /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util: StlList.h
 StlSet.h
Date: Fri, 17 Dec 2010 16:55:58 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101217165558.EA1BC23889B2@eris.apache.org>

Author: tabish
Date: Fri Dec 17 16:55:58 2010
New Revision: 1050448

URL: http://svn.apache.org/viewvc?rev=1050448&view=rev
Log:
Couple of small fixes for windows builds

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlList.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlSet.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlList.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlList.h?rev=1050448&r1=1050447&r2=1050448&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlList.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlList.h Fri Dec 17 16:55:58 2010
@@ -264,25 +264,32 @@ namespace util{
             AbstractList<E>::copy( source );
         }
 
-        virtual ~StlList() {}
-
-        using AbstractList<E>::equals;
-
         /**
          * {@inheritDoc}
          */
-        bool equals( const StlList& source ) const {
-            return this->values == source.values;
-        }
+        virtual bool equals( const Collection<E>& collection ) const {
 
-        using AbstractList<E>::copy;
+            const StlList<E>* listptr = dynamic_cast<const StlList<E>*>( &collection );
+            if( listptr == NULL ) {
+                return AbstractList<E>::equals( collection );
+            }
+
+            return this->values == listptr->values;
+        }
 
         /**
          * {@inheritDoc}
          */
-        void copy( const StlList& source ) {
+        virtual void copy( const Collection<E>& collection ) {
+
+            const StlList<E>* listptr = dynamic_cast<const StlList<E>*>( &collection );
+            if( listptr == NULL ) {
+                AbstractList<E>::copy( collection );
+                return;
+            }
+
             this->values.clear();
-            this->values = source.values;
+            this->values = listptr->values;
         }
 
         /**

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlSet.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlSet.h?rev=1050448&r1=1050447&r2=1050448&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlSet.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/StlSet.h Fri Dec 17 16:55:58 2010
@@ -159,23 +159,32 @@ namespace util{
             return new ConstSetIterator( &values );
         }
 
-        using AbstractSet<E>::equals;
-
         /**
          * {@inheritDoc}
          */
-        bool equals( const StlSet& source ) const {
-            return this->values == source.values;
-        }
+        virtual bool equals( const Collection<E>& collection ) const {
+
+            const StlSet<E>* setptr = dynamic_cast<const StlSet<E>*>( &collection );
+            if( setptr == NULL ) {
+                return AbstractSet<E>::equals( collection );
+            }
 
-        using AbstractSet<E>::copy;
+            return this->values == setptr->values;
+        }
 
         /**
          * {@inheritDoc}
          */
-        void copy( const StlSet& source ) {
+        virtual void copy( const Collection<E>& collection ) {
+
+            const StlSet<E>* setptr = dynamic_cast<const StlSet<E>*>( &collection );
+            if( setptr == NULL ) {
+                AbstractSet<E>::copy( collection );
+                return;
+            }
+
             this->values.clear();
-            this->values = source.values;
+            this->values = setptr->values;
         }
 
         /**