Changeset b5563e1 for src/libcfa

Timestamp:

Mar 27, 2018, 10:21:32 AM (8 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, with_gc

Children:

3d2b7bc

Parents:

a9b1b0c (diff), af1ed1ad (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

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• time (added)

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Feb  9 15:51:24 2018
-## Update Count     : 223
+## Last Modified On : Thu Mar 22 17:14:15 2018
+## Update Count     : 224
 ###############################################################################
 
@@ -99 +99 @@
         ${stdhdr}                       \
         math                            \
+        time                            \
         gmp                             \
         bits/align.h            \

src/libcfa/Makefile.in

@@ -263 +263 @@
         containers/result containers/vector concurrency/coroutine \
         concurrency/thread concurrency/kernel concurrency/monitor \
-        ${shell find stdhdr -type f -printf "%p "} math gmp \
+        ${shell find stdhdr -type f -printf "%p "} math time gmp \
         bits/align.h bits/cfatime.h bits/containers.h bits/defs.h \
         bits/debug.h bits/locks.h concurrency/invoke.h
@@ -435 +435 @@
         ${stdhdr}                       \
         math                            \
+        time                            \
         gmp                             \
         bits/align.h            \