Changeset 79e23836


Ignore:
Timestamp:
Mar 14, 2021, 10:04:10 PM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
34d62a7
Parents:
5f39135 (diff), 4c05a40 (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

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/heap.cfa

    r5f39135 r79e23836  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Jan 10 11:20:49 2021
    13 // Update Count     : 1031
     12// Last Modified On : Sun Mar 14 10:39:24 2021
     13// Update Count     : 1032
    1414//
    1515
     
    5252static bool prtFree = false;
    5353
    54 inline bool prtFree() {
     54bool prtFree() {
    5555        return prtFree;
    5656} // prtFree
  • tests/include/.expect/includes.nast.txt

    r5f39135 r79e23836  
    22/usr/include/x86_64-linux-gnu/bits/socket.h:285:44: note: the ABI of passing struct with a flexible array member has changed in GCC 4.4
    33include/includes.cfa: In function '_X4mainFi_iPPKc__1':
    4 include/includes.cfa:186:9: note: #pragma message: Compiled
     4include/includes.cfa:154:9: note: #pragma message: Compiled
  • tests/include/includes.cfa

    r5f39135 r79e23836  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // Includes.cfa --
     7// includes.cfa --
    88//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Tue Mar  2 15:03:40 2021
    13 // Update Count     : 690
     12// Last Modified On : Sun Mar 14 10:18:26 2021
     13// Update Count     : 746
    1414//
    1515
     
    1919
    2020//#define _GNU_SOURCE
    21 //#include <FlexLexer.h>
    2221#include <aio.h>
    2322#include <aliases.h>
     
    3332#include <ctype.h>
    3433#include <curses.h>
    35 //#include <cursesapp.h>
    36 //#include <cursesf.h>
    37 //#include <cursesm.h>
    38 //#include <cursesp.h>
    39 //#include <cursesw.h>
    40 //#include <cursslk.h>
    4134#include <dirent.h>
    4235#include <dlfcn.h>
    4336#include <elf.h>
    44 //#include <emacs-module.h>                                                             // may not be installed
    4537#include <endian.h>
    4638#include <envz.h>
     
    4941#include <error.h>
    5042#include <eti.h>
    51 //#include <etip.h>
    5243#include <execinfo.h>
    53 //#include <expat.h>                                                                            // 32-bit attribute-location problem
     44//#include <expat.h>                                                                    // 32-bit attribute-location problem
    5445#include <expat_external.h>
    5546#include <fcntl.h>
     
    6758#include <getopt.h>
    6859#include <glob.h>
    69 //#include <gmpxx.h>
    7060#include <gnumake.h>
    7161#include <gnu-versions.h>
     
    8272//#include <link.h>                                                                             // CFA bug #240 nested anonymous enum fails
    8373#include <locale.h>
    84 //#include <ltdl.h>
    85 //#include <lzma.h>                                                                             // may not be installed
    86 //#include <malloc.h>                                                                           // CFA #include_next
     74#include <ltdl.h>
     75//#include <malloc.h>                                                                   // cannot include in extern "C" because of CFA #include_next
    8776#include <math.h>
    8877#include <mcheck.h>
     
    9180#include <mntent.h>
    9281#include <monetary.h>
    93 #include <mpath_cmd.h>
    94 #include <mpath_persist.h>
    9582#include <mqueue.h>
    9683#include <ncurses_dll.h>
    97 //#include <nc_tparm.h>
    9884#include <netdb.h>
    9985#include <nl_types.h>
     
    10995#include <pwd.h>
    11096#include <regex.h>
    111 //#include <regexp.h>
    11297#include <resolv.h>
    11398#include <re_comp.h>
     
    139124#include <term_entry.h>
    140125#include <tgmath.h>
    141 #include <threads.h>
     126//#include <threads.h>                                                                  // does not exist
    142127#include <thread_db.h>
    143 //#include <tic.h>
    144128#include <time.h>
    145129#include <ttyent.h>
     
    157141#include <wctype.h>
    158142#include <wordexp.h>
    159 #include <z3.h>
    160 //#include <z3++.h>
    161 #include <z3_algebraic.h>
    162 #include <z3_api.h>
    163 #include <z3_ast_containers.h>
    164 #include <z3_fixedpoint.h>
    165 #include <z3_fpa.h>
    166 #include <z3_macros.h>
    167 #include <z3_optimization.h>
    168 #include <z3_polynomial.h>
    169 #include <z3_rcf.h>
    170 #include <z3_spacer.h>
    171 //#include <z3_v1.h>
    172 #include <z3_version.h>
    173 #include <zconf.h>
    174 #include <zlib.h>
    175143
    176144#if 0
     
    187155// Local Variables: //
    188156// tab-width: 4 //
    189 // compile-command: "cfa Includes.cfa" //
     157// compile-command: "cfa includes.cfa" //
    190158// End: //
Note: See TracChangeset for help on using the changeset viewer.