Changes in / [2162c2c:d3a85240]


Ignore:
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • configure

    r2162c2c rd3a85240  
    32143214
    32153215if test "$includedir" = '${prefix}/include'; then
    3216         cfa_incdir="${cfa_prefix}/include/cfa"
     3216        cfa_incdir="${cfa_prefix}/include"
    32173217else
    32183218        cfa_incdir=${includedir}

  • configure.ac

    r2162c2c rd3a85240  
    122122
    123123if test "$includedir" = '${prefix}/include'; then
    124         cfa_incdir="${cfa_prefix}/include/cfa"
     124        cfa_incdir="${cfa_prefix}/include"
    125125else
    126126        cfa_incdir=${includedir}

  • src/driver/cfa.cc

    r2162c2c rd3a85240  
    246246        if ( link ) {
    247247                #if ! defined(HAVE_LIBCFA_RELEASE)
    248                         if( !debug ) {
     248                        if( !debug ) { 
    249249                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
    250250                                exit( EXIT_FAILURE );
    … …  
    252252                #endif
    253253                #if ! defined(HAVE_LIBCFA_DEBUG)
    254                         if( debug ) {
     254                        if( debug ) { 
    255255                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
    256256                                exit( EXIT_FAILURE );

  • src/libcfa/Makefile.am

    r2162c2c rd3a85240  
    6565stdhdr = ${shell echo stdhdr/*}
    6666
    67 cfa_includedir = $(includedir)/cfa
    68 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
     67nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    6968
    7069CLEANFILES = libcfa-prelude.c

  • src/libcfa/Makefile.in

    r2162c2c rd3a85240  
    4242@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
    4343subdir = src/libcfa
    44 DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
     44DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
    4545        $(srcdir)/Makefile.in
    4646ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    7979         $(am__cd) "$$dir" && rm -f $$files; }; \
    8080  }
    81 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"
     81am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
    8282LIBRARIES = $(lib_LIBRARIES)
    8383AR = ar
    … …  
    144144SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    145145DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    146 HEADERS = $(nobase_cfa_include_HEADERS)
     146HEADERS = $(nobase_include_HEADERS)
    147147ETAGS = etags
    148148CTAGS = ctags
    … …  
    281281libcfa_d_a_CFLAGS = -debug -O0
    282282stdhdr = ${shell echo stdhdr/*}
    283 cfa_includedir = $(includedir)/cfa
    284 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
     283nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    285284CLEANFILES = libcfa-prelude.c
    286285all: all-am
    … …  
    762761@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    763762@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi`
    764 install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
     763install-nobase_includeHEADERS: $(nobase_include_HEADERS)
    765764        @$(NORMAL_INSTALL)
    766         test -z "$(cfa_includedir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)"
    767         @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
     765        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
     766        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
    768767        $(am__nobase_list) | while read dir files; do \
    769768          xfiles=; for file in $$files; do \
    … …  
    772771          test -z "$$xfiles" || { \
    773772            test "x$$dir" = x. || { \
    774               echo "$(MKDIR_P) '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
    775               $(MKDIR_P) "$(DESTDIR)$(cfa_includedir)/$$dir"; }; \
    776             echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(cfa_includedir)/$$dir'"; \
    777             $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(cfa_includedir)/$$dir" || exit $$?; }; \
     773              echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
     774              $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
     775            echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
     776            $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
    778777        done
    779778
    780 uninstall-nobase_cfa_includeHEADERS:
     779uninstall-nobase_includeHEADERS:
    781780        @$(NORMAL_UNINSTALL)
    782         @list='$(nobase_cfa_include_HEADERS)'; test -n "$(cfa_includedir)" || list=; \
     781        @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
    783782        $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
    784         dir='$(DESTDIR)$(cfa_includedir)'; $(am__uninstall_files_from_dir)
     783        dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
    785784
    786785ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    … …  
    870869all-am: Makefile $(LIBRARIES) $(HEADERS)
    871870installdirs:
    872         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cfa_includedir)"; do \
     871        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
    873872          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    874873        done
    … …  
    930929info-am:
    931930
    932 install-data-am: install-nobase_cfa_includeHEADERS
     931install-data-am: install-nobase_includeHEADERS
    933932
    934933install-dvi: install-dvi-am
    … …  
    976975ps-am:
    977976
    978 uninstall-am: uninstall-libLIBRARIES \
    979         uninstall-nobase_cfa_includeHEADERS
     977uninstall-am: uninstall-libLIBRARIES uninstall-nobase_includeHEADERS
    980978
    981979.MAKE: install-am install-strip
    … …  
    988986        install-exec-am install-html install-html-am install-info \
    989987        install-info-am install-libLIBRARIES install-man \
    990         install-nobase_cfa_includeHEADERS install-pdf install-pdf-am \
     988        install-nobase_includeHEADERS install-pdf install-pdf-am \
    991989        install-ps install-ps-am install-strip installcheck \
    992990        installcheck-am installdirs maintainer-clean \
    … …  
    994992        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
    995993        tags uninstall uninstall-am uninstall-libLIBRARIES \
    996         uninstall-nobase_cfa_includeHEADERS
     994        uninstall-nobase_includeHEADERS
    997995
    998996

  • src/libcfa/concurrency/threads

    r2162c2c rd3a85240  
    1414// Update Count     : 0
    1515//
     16
     17#ifdef __CFORALL__
    1618
    1719#ifndef THREADS_H
    … …  
    7375      coroutine* src = this_coroutine();                // optimization
    7476
    75         assertf( src->last != 0,
     77        assertf( src->last != 0, 
    7678                "Attempt to suspend coroutine %.256s (%p) that has never been resumed.\n"
    7779                "Possible cause is a suspend executed in a member called by a coroutine user rather than by the coroutine main.",
    7880                src->name, src );
    79         assertf( src->last->notHalted,
     81        assertf( src->last->notHalted, 
    8082                "Attempt by coroutine %.256s (%p) to suspend back to terminated coroutine %.256s (%p).\n"
    8183                "Possible cause is terminated coroutine's main routine has already returned.",
    … …  
    98100      // not resuming self ?
    99101        if ( src != dst ) {
    100                 assertf( dst->notHalted ,
     102                assertf( dst->notHalted , 
    101103                        "Attempt by coroutine %.256s (%p) to resume terminated coroutine %.256s (%p).\n"
    102104                        "Possible cause is terminated coroutine's main routine has already returned.",
    … …  
    113115#endif //THREADS_H
    114116
     117#else
     118#include_next <thread>
     119#endif //__CFORALL__
     120
    115121// Local Variables: //
    116122// mode: c //

  • src/libcfa/containers/vector

    r2162c2c rd3a85240  
    1313// Update Count     : 2
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef VECTOR_H
    … …  
    168170#endif // VECTOR_H
    169171
     172#else
     173#include_next <vector>
     174#endif //__CFORALL__
     175
    170176// Local Variables: //
    171177// mode: c //

  • src/libcfa/fstream

    r2162c2c rd3a85240  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // fstream --
     7// fstream -- 
    88//
    99// Author           : Peter A. Buhr
    … …  
    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 //
    6672// tab-width: 4 //
    6773// End: //
     74

  • src/libcfa/iostream

    r2162c2c rd3a85240  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // iostream --
     7// iostream -- 
    88//
    99// Author           : Peter A. Buhr
    … …  
    1313// Update Count     : 93
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef __IOSTREAM_H__
    … …  
    2628        void sepReset( ostype *, _Bool );                                       // set separator and default state
    2729        void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
    28         const char * sepGet( ostype * );                                        // get separator string
     30        const char * sepGet( ostype * );                                        // get separator string 
    2931        _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
    3032        _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
    … …  
    126128#endif // __IOSTREAM_H
    127129
     130#else
     131#include_next <iostream>
     132#endif //__CFORALL__
     133
    128134// Local Variables: //
    129135// mode: c //

  • src/libcfa/iterator

    r2162c2c rd3a85240  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // iterator --
     7// iterator -- 
    88//
    99// Author           : Richard C. Bilson
    … …  
    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

    r2162c2c rd3a85240  
    1 //
     1// 
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 //
    7 // limits --
    8 //
     6// 
     7// limits -- 
     8// 
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Apr  6 18:06:52 2016
    … …  
    1212// Last Modified On : Wed Apr  6 21:08:16 2016
    1313// Update Count     : 6
    14 //
     14//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef LIMITS_H
    … …  
    112114#endif // LIMITS_H
    113115
     116#else
     117#include_next <limits>
     118#endif //__CFORALL__
     119
    114120// Local Variables: //
    115121// mode: c //

  • src/libcfa/math

    r2162c2c rd3a85240  
    1 //
     1// 
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    … …  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // math --
    8 //
     7// math -- 
     8// 
    99// Author           : Peter A. Buhr
    1010// Created On       : Mon Apr 18 23:37:04 2016
    … …  
    1212// Last Modified On : Sun Apr 24 12:45:02 2016
    1313// Update Count     : 59
    14 //
     14//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef MATH_H
    … …  
    354356#endif // MATH_H
    355357
     358#else
     359#include_next <math>
     360#endif //__CFORALL__
     361
    356362// Local Variables: //
    357363// mode: c //

  • src/libcfa/rational

    r2162c2c rd3a85240  
    1 //
     1// 
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 //
     6// 
    77// rational -- Rational numbers are numbers written as a ratio, i.e., as a fraction, where the numerator (top number)
    88//     and the denominator (bottom number) are whole numbers. When creating and computing with rational numbers, results
    99//     are constantly reduced to keep the numerator and denominator as small as possible.
    10 //
     10// 
    1111// Author           : Peter A. Buhr
    1212// Created On       : Wed Apr  6 17:56:25 2016
    … …  
    1414// Last Modified On : Wed May  4 14:11:45 2016
    1515// Update Count     : 16
    16 //
     16//
     17#ifdef __CFORALL__
     18
    1719#ifndef RATIONAL_H
    1820#define RATIONAL_H
    … …  
    6567#endif // RATIONAL_H
    6668
     69#else
     70#include_next <rational>
     71#endif //__CFORALL__
     72
    6773// Local Variables: //
    6874// mode: c //

  • src/libcfa/stdlib

    r2162c2c rd3a85240  
    1313// Update Count     : 99
    1414//
     15
     16#ifdef __CFORALL__
    1517
    1618#ifndef STDLIB_H
    … …  
    136138#endif // STDLIB_H
    137139
     140#else
     141#include_next <stdlib>
     142#endif //__CFORALL__
     143
    138144// Local Variables: //
    139145// mode: c //
Note: See TracChangeset for help on using the changeset viewer.