Changeset 85d340d

Timestamp:

Oct 24, 2017, 9:49:30 AM (7 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:

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:

• Common/utility.h (modified) (1 diff)
• main.cc (modified) (1 diff)

src/Common/utility.h

@@ -18 +18 @@
 #include <cctype>
 #include <algorithm>
+#include <functional>
 #include <iostream>
 #include <iterator>

src/main.cc

@@ -502 +502 @@
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
+                        #if __GNUC__ < 7
+                        #else
+                                __attribute__((fallthrough));
+                        #endif
                   default:
                         abort();