Changeset 6ac5223 for src/main.cc

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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:software/cfa/cfa-cc

File:

• src/main.cc (modified) (2 diffs)

src/main.cc

@@ -15 +15 @@
 //
 
-#include <cassert>                          // for assertf
 #include <cxxabi.h>                         // for __cxa_demangle
 #include <execinfo.h>                       // for backtrace, backtrace_symbols
 #include <getopt.h>                         // for no_argument, optind, geto...
 #include <signal.h>                         // for signal, SIGABRT, SIGSEGV
+#include <cassert>                          // for assertf
 #include <cstdio>                           // for fopen, FILE, fclose, stdin
 #include <cstdlib>                          // for exit, free, abort, EXIT_F...
@@ -27 +27 @@
 #include <iterator>                         // for back_inserter
 #include <list>                             // for list
-#include <string>                           // for operator<<, allocator
+#include <string>                           // for char_traits, operator<<
 
 #include "../config.h"                      // for CFA_LIBDIR