Author: tabish
Date: Wed Nov 21 00:13:20 2012
New Revision: 1411945
URL: http://svn.apache.org/viewvc?rev=1411945&view=rev
Log:
Fix a bunch of compiler warnings
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/ConcurrentStlMap.h
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/ConcurrentStlMap.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/ConcurrentStlMap.h?rev=1411945&r1=1411944&r2=1411945&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/ConcurrentStlMap.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/ConcurrentStlMap.h
Wed Nov 21 00:13:20 2012
@@ -67,6 +67,11 @@ namespace concurrent{
ConcurrentStlMap* associatedMap;
+ private:
+
+ AbstractMapIterator(const AbstractMapIterator&);
+ AbstractMapIterator& operator= (const AbstractMapIterator&);
+
public:
AbstractMapIterator(ConcurrentStlMap* parent) : position(0),
@@ -230,6 +235,11 @@ namespace concurrent{
const ConcurrentStlMap* associatedMap;
+ private:
+
+ ConstAbstractMapIterator(const ConstAbstractMapIterator&);
+ ConstAbstractMapIterator& operator= (const
ConstAbstractMapIterator&);
+
public:
ConstAbstractMapIterator(const ConcurrentStlMap* parent) :
position(0),
@@ -672,14 +682,20 @@ namespace concurrent{
/**
* Default constructor - does nothing.
*/
- ConcurrentStlMap() : ConcurrentMap<K,V>(), valueMap(), mutex(),
modCount(0) {}
+ ConcurrentStlMap() : ConcurrentMap<K,V>(), valueMap(), mutex(),
modCount(0),
+ cachedEntrySet(), cachedKeySet(),
cachedValueCollection(),
+ cachedConstEntrySet(), cachedConstKeySet(),
cachedConstValueCollection() {
+
+ }
/**
* Copy constructor - copies the content of the given map into this
* one.
* @param source The source map.
*/
- ConcurrentStlMap(const ConcurrentStlMap& source) : ConcurrentMap<K,
V>(), valueMap(), mutex(), modCount(0) {
+ ConcurrentStlMap(const ConcurrentStlMap& source) : ConcurrentMap<K,
V>(), valueMap(), mutex(), modCount(0),
+ cachedEntrySet(),
cachedKeySet(), cachedValueCollection(),
+
cachedConstEntrySet(), cachedConstKeySet(), cachedConstValueCollection() {
copy(source);
}
@@ -688,7 +704,9 @@ namespace concurrent{
* one.
* @param source The source map.
*/
- ConcurrentStlMap(const Map<K, V>& source) : ConcurrentMap<K, V>(),
valueMap(), mutex(), modCount(0) {
+ ConcurrentStlMap(const Map<K, V>& source) : ConcurrentMap<K, V>(),
valueMap(), mutex(), modCount(0),
+ cachedEntrySet(),
cachedKeySet(), cachedValueCollection(),
+ cachedConstEntrySet(),
cachedConstKeySet(), cachedConstValueCollection() {
copy(source);
}