Changeset db9d7a9

Timestamp:

Feb 3, 2023, 12:24:01 PM (22 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

2125443a

Parents:

85dd381

Message:

Fixed clang++-10 error. One of the problem functions was never used and may not add functionality, it was removed. The other was simply moved, although changing it might be better, that was not working as a quick fix.

File:

• src/Common/ScopedMap.h (modified) (4 diffs)

src/Common/ScopedMap.h

@@ -46 +46 @@
         typedef std::vector< Scope > ScopeList;
 
-        ScopeList scopes; ///< scoped list of maps
+        /// Scoped list of maps.
+        ScopeList scopes;
 public:
         typedef typename MapType::key_type key_type;
@@ -146 +147 @@
         }
 
-        template< typename value_type_t >
-        std::pair< iterator, bool > insert( iterator at, value_type_t && value ) {
-                MapType & scope = (*at.scopes)[ at.level ].map;
-                std::pair< typename MapType::iterator, bool > res = scope.insert( std::forward<value_type_t>( value ) );
-                return std::make_pair( iterator(scopes, std::move( res.first ), at.level), std::move( res.second ) );
-        }
-
         template< typename value_t >
         std::pair< iterator, bool > insert( const Key & key, value_t && value ) { return insert( std::make_pair( key, std::forward<value_t>( value ) ) ); }
@@ -173 +167 @@
         }
 
-        iterator erase( iterator pos ) {
-                MapType & scope = (*pos.scopes)[ pos.level ].map;
-                const typename iterator::wrapped_iterator & new_it = scope.erase( pos.it );
-                iterator it( *pos.scopes, new_it, pos.level );
-                return it.next_valid();
-        }
+        iterator erase( iterator pos );
 
         size_type count( const Key & key ) const {
@@ -352 +341 @@
 };
 
+template<typename Key, typename Value, typename Note>
+typename ScopedMap<Key, Value, Note>::iterator
+                ScopedMap<Key, Value, Note>::erase( iterator pos ) {
+        MapType & scope = (*pos.scopes)[ pos.level ].map;
+        const typename iterator::wrapped_iterator & new_it = scope.erase( pos.it );
+        iterator it( *pos.scopes, new_it, pos.level );
+        return it.next_valid();
+}
+
 // Local Variables: //
 // tab-width: 4 //