Changeset ab1a9ea


Ignore:
Timestamp:
Feb 1, 2022, 12:20:46 PM (8 months ago)
Author:
caparsons <caparson@…>
Branches:
enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum
Children:
4de48c5, 729c991
Parents:
34c32f0
Message:

fixed merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Pass.impl.hpp

    r34c32f0 rab1a9ea  
    10501050        VISIT_START( node );
    10511051
    1052 <<<<<<< HEAD
    1053         VISIT(
    1054                 maybe_accept( node, &MutexStmt::mutexObjs );
    1055                 {
    1056                         // mutex statements introduce a level of scope (for the initialization)
    1057                         guard_symtab guard { *this };
    1058                         maybe_accept( node, &MutexStmt::stmt );
    1059                        
    1060                 }
    1061         )
    1062 =======
    10631052        if ( __visit_children() ) {
    10641053                // mutex statements introduce a level of scope (for the initialization)
     
    10671056                maybe_accept( node, &MutexStmt::mutexObjs );
    10681057        }
    1069 >>>>>>> e21f2536b7495654ded040259b42b7e2325b8360
    10701058
    10711059        VISIT_END( Stmt, node );
Note: See TracChangeset for help on using the changeset viewer.