Changes in src/GenPoly/ScopedSet.h [7f1be01:e9b5043]

File:

• src/GenPoly/ScopedSet.h (modified) (8 diffs)

src/GenPoly/ScopedSet.h

@@ -47 +47 @@
         /// Starts a new scope
         void beginScope() {
-                scopes.emplace_back();
+                Scope scope;
+                scopes.push_back(scope);
         }
 
@@ -84 +85 @@
         iterator findNext( const_iterator &it, const Value &key ) {
                 if ( it.i == 0 ) return end();
-                for ( size_type i = it.i - 1; ; --i ) {
+                        for ( size_type i = it.i - 1; ; --i ) {
                         typename Scope::iterator val = scopes[i].find( key );
                         if ( val != scopes[i].end() ) return iterator( scopes, val, i );
@@ -111 +112 @@
         friend class ScopedSet;
         friend class const_iterator;
-        typedef typename Scope::iterator wrapped_iterator;
-        typedef typename ScopeList::size_type size_type;
+        typedef typename std::set< Value >::iterator wrapped_iterator;
+        typedef typename std::vector< std::set< Value > > scope_list;
+        typedef typename scope_list::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -131 +133 @@
         }
 
-        iterator(ScopeList const &_scopes, const wrapped_iterator &_it, size_type _i)
+        iterator(scope_list const &_scopes, const wrapped_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -174 +176 @@
 
 private:
-        ScopeList const *scopes;
+        scope_list const *scopes;
         wrapped_iterator it;
         size_type i;
@@ -183 +185 @@
                 public std::iterator< std::bidirectional_iterator_tag, value_type > {
         friend class ScopedSet;
-        typedef typename Scope::iterator wrapped_iterator;
-        typedef typename Scope::const_iterator wrapped_const_iterator;
-        typedef typename ScopeList::size_type size_type;
+        typedef typename std::set< Value >::iterator wrapped_iterator;
+        typedef typename std::set< Value >::const_iterator wrapped_const_iterator;
+        typedef typename std::vector< std::set< Value > > scope_list;
+        typedef typename scope_list::size_type size_type;
 
         /// Checks if this iterator points to a valid item
@@ -204 +207 @@
         }
 
-        const_iterator(ScopeList const &_scopes, const wrapped_const_iterator &_it, size_type _i)
+        const_iterator(scope_list const &_scopes, const wrapped_const_iterator &_it, size_type _i)
                 : scopes(&_scopes), it(_it), i(_i) {}
 public:
@@ -252 +255 @@
 
 private:
-        ScopeList const *scopes;
+        scope_list const *scopes;
         wrapped_const_iterator it;
         size_type i;