Ignore:
Timestamp:
Jun 21, 2016, 2:45:33 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
10dc7491, 48a8127
Parents:
927e9ce (diff), b2b039d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/ScopedSet.h

    r927e9ce r6bc4734  
    8787                                return next_valid();
    8888                        }
    89                         iterator& operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
     89                        iterator operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
    9090
    9191                        iterator& operator-- () {
     
    9898                                return prev_valid();
    9999                        }
    100                         iterator& operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
     100                        iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
    101101
    102102                        bool operator== (const iterator &that) {
     
    163163                                return next_valid();
    164164                        }
    165                         const_iterator& operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
     165                        const_iterator operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
    166166
    167167                        const_iterator& operator-- () {
     
    174174                                return prev_valid();
    175175                        }
    176                         const_iterator& operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
     176                        const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
    177177
    178178                        bool operator== (const const_iterator &that) {
Note: See TracChangeset for help on using the changeset viewer.