Changeset cdbab55 for tests/time.c

Timestamp:

Aug 21, 2018, 2:24:29 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6a (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

tests/time.c

@@ -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.
-// 
-// time.c -- 
-// 
+//
+// time.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Mar 27 17:24:56 2018
@@ -12 +12 @@
 // Last Modified On : Fri Apr  6 11:27:23 2018
 // Update Count     : 16
-// 
+//
 
-#include "time"
-#include <fstream>
+#include "time.hfa"
+#include <fstream.hfa>
 
 int main() {
-        Duration d1 = 3`h, d2 = 2`s, d3 = 3.07`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
+        Duration d1 = 3`h, d2 = 2`s, d3 = 3.375`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
         sout | d1 | d2 | d3 | d4 | d5 | endl;
         int i;