Ignore:
Timestamp:
Jul 30, 2015, 4:08:34 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
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, resolv-new, string, with_gc
Children:
8c84ebd, ae4c85a
Parents:
5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Validate.cc

    r5aa708c rf678663  
    162162        class EliminateTypedef : public Mutator {
    163163          public:
    164                 EliminateTypedef() : scopeLevel( 0 ) {}
     164          EliminateTypedef() : scopeLevel( 0 ) {}
     165            /// Replaces typedefs by forward declarations
    165166                static void eliminateTypedef( std::list< Declaration * > &translationUnit );
    166167          private:
     
    542543                std::list<Statement *> initList;
    543544                initList.push_back( initStmt );
    544 
     545 
    545546                UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
    546547                cond->get_args().push_back( new VariableExpr( index ) );
     
    617618
    618619                // need to remove the prototypes, since this may be nested in a routine
    619                 for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
     620                for (int start = 0, end = assigns.size()/2; start < end; start++) {
    620621                        delete assigns.front();
    621622                        assigns.pop_front();
     
    960961        }
    961962
    962         Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
     963                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
    963964                Mutator::mutate( contextDecl );
    964965                return handleAggregate( contextDecl );
Note: See TracChangeset for help on using the changeset viewer.