Changeset 515a037 for benchmark

Timestamp:

Dec 12, 2018, 3:52:19 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1b8f13f0

Parents:

cdc02f2 (diff), 85acec94 (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 shared_library

Location:

benchmark

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• Monitor.c (modified) (1 diff)

benchmark/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jan 25 22:31:42 2016
-## Update Count     : 25
+## Last Modified On : Tue Nov  6 09:01:23 2018
+## Update Count     : 26
 ###############################################################################
 
@@ -308 +308 @@
 
 compile-attributes$(EXEEXT):
-        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
+        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
 
 compile-empty$(EXEEXT):

benchmark/Makefile.in

@@ -879 +879 @@
 
 compile-attributes$(EXEEXT):
-        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
+        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
 
 compile-empty$(EXEEXT):

benchmark/Monitor.c

@@ -29 +29 @@
         EndTime = Time();
 
-        sout | ( EndTime - StartTime ) / N | endl;
+        sout | ( EndTime - StartTime ) / N;
 }