Changeset 9236060 for src/Concurrency

Timestamp:

Aug 14, 2017, 2:03:39 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

74b007ba

Parents:

fd344aa (diff), 54cd58b (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' into references

Location:

src/Concurrency

Files:

• Keywords.cc (modified) (3 diffs)
• Keywords.h (modified) (3 diffs)

src/Concurrency/Keywords.cc

@@ -1 @@
-//                              -*- Mode: CPP -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -12 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 3
+// Update Count     : 5
 //
 
@@ -549 +548 @@
         }
 };
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //

src/Concurrency/Keywords.h

@@ -1 @@
-//                              -*- Mode: CPP -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -12 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 0
+// Update Count     : 1
 //
 
-#ifndef KEYWORDS_H
-#define KEYWORDS_H
+#pragma once
 
 #include <list>  // for list
@@ -28 +26 @@
 };
 
-#endif //KEYWORDS_H
+// Local Variables: //
+// tab-width: 4 //
+// mode: c++ //
+// compile-command: "make install" //
+// End: //