Changeset 23a08aa0 for driver


Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

Location:
driver
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • driver/Makefile.am

    rebf8ca5 r23a08aa0  
    1919
    2020# applies to both programs
    21 AM_CXXFLAGS = @HOST_FLAGS@ -Wall -Wextra -Werror=return-type -O2 -g -std=c++14 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
     21AM_CXXFLAGS = @HOST_FLAGS@ -Wall -Wextra -Werror=return-type -O2 -g -std=c++17 -I${abs_top_srcdir}/src -I${abs_top_srcdir}/src/include
    2222
    2323# don't install cfa directly

  • driver/cfa.cc

    rebf8ca5 r23a08aa0  
    5353        return arg.substr( 0, pre.size() ) == pre;
    5454} // prefix
    55 
    56 static inline bool ends_with(const string & str, const string & sfix) {
    57         if (sfix.size() > str.size()) return false;
    58         return std::equal(str.rbegin(), str.rbegin() + sfix.size(), sfix.rbegin(), sfix.rend());
    59 }
    6055
    6156// check if string has suffix
Note: See TracChangeset for help on using the changeset viewer.