Changeset d3a85240 for src/libcfa


Ignore:
Timestamp:
Jan 11, 2017, 3:30:10 PM (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, resolv-new, with_gc
Children:
2162c2c, 2298a7b8
Parents:
dd0c97b (diff), 17e5e2b (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:
9 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/concurrency/threads

    rdd0c97b rd3a85240  
    1515//
    1616
    17 #ifndef __THREADS_H__
    18 #define __THREADS_H__
     17#ifdef __CFORALL__
     18
     19#ifndef THREADS_H
     20#define THREADS_H
    1921
    2022#include "assert"       //
    … …  
    111113}
    112114
    113 #endif //__THREADS_H__
     115#endif //THREADS_H
     116
     117#else
     118#include_next <thread>
     119#endif //__CFORALL__
    114120
    115121// Local Variables: //

  • src/libcfa/containers/vector

    rdd0c97b rd3a85240  
    1414//
    1515
    16 #pragma once
     16#ifdef __CFORALL__
     17
     18#ifndef VECTOR_H
     19#define VECTOR_H
    1720
    1821extern "C" {
    … …  
    165168}
    166169
     170#endif // VECTOR_H
     171
     172#else
     173#include_next <vector>
     174#endif //__CFORALL__
     175
    167176// Local Variables: //
    168177// mode: c //

  • src/libcfa/fstream

    rdd0c97b rd3a85240  
    1313// Update Count     : 88
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef __FSTREAM_H__
    … …  
    6264#endif // __FSTREAM_H__
    6365
     66#else
     67#include_next <fstream>
     68#endif //__CFORALL__
     69
    6470// Local Variables: //
    6571// mode: c //

  • src/libcfa/iostream

    rdd0c97b rd3a85240  
    1313// Update Count     : 93
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef __IOSTREAM_H__
    … …  
    124126forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC );
    125127
    126 #endif // __IOSTREAM_H__
     128#endif // __IOSTREAM_H
     129
     130#else
     131#include_next <iostream>
     132#endif //__CFORALL__
    127133
    128134// Local Variables: //

  • src/libcfa/iterator

    rdd0c97b rd3a85240  
    1313// Update Count     : 9
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef ITERATOR_H
    … …  
    4648#endif // ITERATOR_H
    4749
     50#else
     51#include_next <iterator>
     52#endif //__CFORALL__
     53
    4854// Local Variables: //
    4955// mode: c //

  • src/libcfa/limits

    rdd0c97b rd3a85240  
    1313// Update Count     : 6
    1414//
     15
     16#ifdef __CFORALL__
     17
     18#ifndef LIMITS_H
     19#define LIMITS_H
    1520
    1621// Integral Constants
    … …  
    107112extern const long _Complex _1_SQRT_2;                                   // 1 / sqrt(2)
    108113
     114#endif // LIMITS_H
     115
     116#else
     117#include_next <limits>
     118#endif //__CFORALL__
     119
    109120// Local Variables: //
    110121// mode: c //

  • src/libcfa/math

    rdd0c97b rd3a85240  
    1414//
    1515
     16#ifdef __CFORALL__
     17
     18#ifndef MATH_H
     19#define MATH_H
     20
    1621extern "C" {
    1722#include <math.h>                                                                               // fpclassify, isfinite, isnormal, isnan, isinf
    … …  
    349354long double scalbln( long double, long int );
    350355
     356#endif // MATH_H
     357
     358#else
     359#include_next <math>
     360#endif //__CFORALL__
     361
    351362// Local Variables: //
    352363// mode: c //

  • src/libcfa/rational

    rdd0c97b rd3a85240  
    1515// Update Count     : 16
    1616//
     17#ifdef __CFORALL__
     18
     19#ifndef RATIONAL_H
     20#define RATIONAL_H
    1721
    1822#include "iostream"
    … …  
    6165forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
    6266
     67#endif // RATIONAL_H
     68
     69#else
     70#include_next <rational>
     71#endif //__CFORALL__
     72
    6373// Local Variables: //
    6474// mode: c //

  • src/libcfa/stdlib

    rdd0c97b rd3a85240  
    1313// Update Count     : 99
    1414//
     15
     16#ifdef __CFORALL__
     17
     18#ifndef STDLIB_H
     19#define STDLIB_H
    1520
    1621//---------------------------------------
    … …  
    131136void swap( T * t1, T * t2 );
    132137
     138#endif // STDLIB_H
     139
     140#else
     141#include_next <stdlib>
     142#endif //__CFORALL__
     143
    133144// Local Variables: //
    134145// mode: c //
Note: See TracChangeset for help on using the changeset viewer.