Changes in src/GenPoly/ErasableScopedMap.h [e9b5043:c1fb3903]

File:

• src/GenPoly/ErasableScopedMap.h (modified) (4 diffs)

src/GenPoly/ErasableScopedMap.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ErasableScopedMap.h --
+// ScopedMap.h --
 //
 // Author           : Aaron B. Moss
@@ -51 +51 @@
         typedef typename Scope::const_pointer const_pointer;
 
-        // Both iterator types are complete bidirectional iterators, see below.
+        // Both iterator types are complete bidirection iterators, defined below.
         class iterator;
         class const_iterator;
@@ -118 +118 @@
         std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
 
-        Value& operator[] ( const Key &key ) {
-                iterator slot = find( key );
-                if ( slot != end() ) return slot->second;
-                return insert( key, Value() ).first->second;
-        }
-
         /// Marks the given element as erased from this scope inward; returns 1 for erased an element, 0 otherwise
         size_type erase( const Key &key ) {
@@ -136 +130 @@
         }
 
-        bool contains( const Key & key ) const {
-                return find( key ) != cend();
+        Value& operator[] ( const Key &key ) {
+                iterator slot = find( key );
+                if ( slot != end() ) return slot->second;
+                return insert( key, Value() ).first->second;
         }
 };