Changeset 85d340d


Ignore:
Timestamp:
Oct 24, 2017, 9:49:30 AM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
b1e68d03, df626eb
Parents:
0e04f59 (diff), af98d27 (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
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Common/utility.h

    r0e04f59 r85d340d  
    1818#include <cctype>
    1919#include <algorithm>
     20#include <functional>
    2021#include <iostream>
    2122#include <iterator>
  • src/main.cc

    r0e04f59 r85d340d  
    502502                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
    503503                        } // if
     504                        #if __GNUC__ < 7
     505                        #else
     506                                __attribute__((fallthrough));
     507                        #endif
    504508                  default:
    505509                        abort();
Note: See TracChangeset for help on using the changeset viewer.