Changes in / [e21f253:cef7430]

File:

• src/AST/Pass.impl.hpp (modified) (2 diffs)

src/AST/Pass.impl.hpp

@@ -1050 +1050 @@
         VISIT_START( node );
 
+<<<<<<< HEAD
+        VISIT(
+                maybe_accept( node, &MutexStmt::mutexObjs );
+                {
+                        // mutex statements introduce a level of scope (for the initialization)
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &MutexStmt::stmt );
+                        
+                }
+        )
+=======
         if ( __visit_children() ) {
                 // mutex statements introduce a level of scope (for the initialization)
@@ -1056 +1067 @@
                 maybe_accept( node, &MutexStmt::mutexObjs );
         }
+>>>>>>> e21f2536b7495654ded040259b42b7e2325b8360
 
         VISIT_END( Stmt, node );