Changeset 23a08aa0 for src/Concurrency/Keywords.cc

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:

• src/Concurrency/Keywords.cc (modified) (9 diffs)

src/Concurrency/Keywords.cc

@@ -508 +508 @@
                 ObjectDecl * vtable_object = Virtual::makeVtableForward(
                         "_default_vtable_object_declaration",
-                        vtable_decl->makeInst( move( poly_args ) ) );
+                        vtable_decl->makeInst( std::move( poly_args ) ) );
                 declsToAddBefore.push_back( vtable_object );
                 declsToAddBefore.push_back(
@@ -681 +681 @@
                         void lock (monitor_t & this) {
                                 lock(get_monitor(this));
-                        }       
+                        }
                 */
                 FunctionDecl * lock_decl = new FunctionDecl(
@@ -700 +700 @@
                 CompoundStmt * lock_statement = new CompoundStmt();
                 lock_statement->push_back(
-                        new ExprStmt( 
+                        new ExprStmt(
                                 new UntypedExpr (
                                         new NameExpr( "lock" ),
@@ -716 +716 @@
                         void unlock (monitor_t & this) {
                                 unlock(get_monitor(this));
-                        }       
+                        }
                 */
                 FunctionDecl * unlock_decl = new FunctionDecl(
@@ -736 +736 @@
 
                 unlock_statement->push_back(
-                        new ExprStmt( 
+                        new ExprStmt(
                                 new UntypedExpr(
                                         new NameExpr( "unlock" ),
@@ -746 +746 @@
                 );
                 unlock_decl->set_statements( unlock_statement );
-                
+
                 // pushes routines to declsToAddAfter to add at a later time
                 declsToAddAfter.push_back( lock_decl );
@@ -1054 +1054 @@
                         assert( !thread_guard_decl );
                         thread_guard_decl = decl;
-                } 
+                }
                 else if ( decl->name == "__mutex_stmt_lock_guard" && decl->body ) {
                         assert( !lock_guard_decl );
@@ -1206 +1206 @@
                                                         new NameExpr( "__get_mutexstmt_lock_type" ),
                                                         { args.front()->clone() }
-                                                ) 
+                                                )
                                         )
                                 ),
@@ -1225 +1225 @@
 
                 StructInstType * lock_guard_struct = new StructInstType( noQualifiers, lock_guard_decl );
-                TypeExpr * lock_type_expr = new TypeExpr( 
+                TypeExpr * lock_type_expr = new TypeExpr(
                         new TypeofType( noQualifiers, new UntypedExpr(
                                 new NameExpr( "__get_mutexstmt_lock_type" ),
                                 { args.front()->clone() }
-                                ) 
-                        ) 
+                                )
+                        )
                 );