Changeset 23a08aa0 for tests/declarationSpecifier.cfa

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:

• tests/declarationSpecifier.cfa (modified) (3 diffs)

tests/declarationSpecifier.cfa

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// declarationSpecifier.cfa -- 
-// 
+//
+// declarationSpecifier.cfa --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:21:04 2016
@@ -12 +12 @@
 // Last Modified On : Tue Apr 30 18:20:36 2019
 // Update Count     : 4
-// 
+//
 
 typedef short int Int;
@@ -51 +51 @@
 struct { Int i; } const static volatile x35;
 struct { Int i; } const volatile static x36;
+
+_Thread_local int x37;
+__thread int x38;
 
 static inline const volatile int f11();