Ignore:
Timestamp:
May 17, 2020, 9:06:36 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
314dab6
Parents:
9c438546 (diff), 365cb03f (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.in

    r9c438546 r893da07  
    240240        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    241241        containers/vector.hfa bitmanip.hfa math.hfa gmp.hfa time_t.hfa \
    242         bits/align.hfa bits/containers.hfa bits/defs.hfa \
     242        clock.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
    243243        bits/debug.hfa bits/locks.hfa containers/list.hfa \
    244244        concurrency/coroutine.hfa concurrency/thread.hfa \
     
    464464
    465465#----------------------------------------------------------------------------------------------------------------
    466 @BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
     466@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     467@BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
     468
    467469@BUILDLIB_FALSE@headers =
    468470@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    469 @BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     471@BUILDLIB_TRUE@         containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    470472
    471473@BUILDLIB_FALSE@libsrc =
Note: See TracChangeset for help on using the changeset viewer.