Changeset 455a7d5 for libcfa/src/time.cfa

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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 jenkins-sandbox

File:

• libcfa/src/time.cfa (moved) (moved from src/libcfa/time.c ) (2 diffs)

libcfa/src/time.cfa

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// time.c -- 
-// 
+//
+// time.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Mar 27 13:33:14 2018
@@ -12 +12 @@
 // Last Modified On : Sun May  6 22:26:00 2018
 // Update Count     : 37
-// 
+//
 
-#include "time"
-#include "iostream"
+#include "time.hfa"
+#include "iostream.hfa"
 #include <stdio.h>                                                                              // snprintf
 #include <assert.h>