activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [1/3] activemq-cpp git commit: Fix some warnings.
Date Tue, 04 Aug 2015 20:16:09 GMT
Repository: activemq-cpp
Updated Branches:
  refs/heads/master d3e13e386 -> 4cbb7aacd


Fix some warnings. 

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/9b84e3ed
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/9b84e3ed
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/9b84e3ed

Branch: refs/heads/master
Commit: 9b84e3ed968b99f35a256b01e52129e091e5414e
Parents: d3e13e3
Author: Timothy Bish <tabish121@gmail.com>
Authored: Tue Aug 4 14:31:03 2015 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Tue Aug 4 14:31:03 2015 -0400

----------------------------------------------------------------------
 activemq-cpp/src/main/decaf/util/Queue.h  | 4 ++++
 activemq-cpp/src/main/decaf/util/StlMap.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9b84e3ed/activemq-cpp/src/main/decaf/util/Queue.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/decaf/util/Queue.h b/activemq-cpp/src/main/decaf/util/Queue.h
index e738f5a..b24e2ee 100644
--- a/activemq-cpp/src/main/decaf/util/Queue.h
+++ b/activemq-cpp/src/main/decaf/util/Queue.h
@@ -122,6 +122,10 @@ namespace util{
          */
         virtual E element() const = 0;
 
+    public:
+
+        using decaf::util::Collection<E>::remove;
+
     };
 
 }}

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9b84e3ed/activemq-cpp/src/main/decaf/util/StlMap.h
----------------------------------------------------------------------
diff --git a/activemq-cpp/src/main/decaf/util/StlMap.h b/activemq-cpp/src/main/decaf/util/StlMap.h
index bc606a6..88d92da 100644
--- a/activemq-cpp/src/main/decaf/util/StlMap.h
+++ b/activemq-cpp/src/main/decaf/util/StlMap.h
@@ -374,7 +374,7 @@ namespace util{
                 return false;
             }
 
-            virtual bool contains(const MapEntry<K,V>& entry) {
+            virtual bool contains(const MapEntry<K,V>& entry) const {
                 if (this->associatedMap->containsKey(entry.getKey()) &&
                     this->associatedMap->get(entry.getKey()) == entry.getValue()) {
                     return true;
@@ -423,7 +423,7 @@ namespace util{
                         __FILE__, __LINE__, "Can't remove from const collection");
             }
 
-            virtual bool contains(const MapEntry<K,V>& entry) {
+            virtual bool contains(const MapEntry<K,V>& entry) const {
                 if (this->associatedMap->containsKey(entry.getKey()) &&
                     this->associatedMap->get(entry.getKey()) == entry.getValue()) {
                     return true;


Mime
View raw message