Changeset e85a8631 for src/Common

Timestamp:

Aug 22, 2016, 2:15:19 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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, stuck-waitfor-destruct, with_gc

Children:

f87408e

Parents:

04cdd9b (diff), 8d2844a (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' into ctor

Location:

src/Common

Files:

• Assert.cc (modified) (3 diffs)
• utility.h (modified) (1 diff)

src/Common/Assert.cc

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:26:59 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 23:40:29 2016
-// Update Count     : 8
+// Last Modified On : Fri Aug 19 17:07:08 2016
+// Update Count     : 10
 // 
 
 #include <assert.h>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
+#include <cstdarg>                                                                              // varargs
+#include <cstdio>                                                                               // fprintf
+#include <cstdlib>                                                                              // abort
 
 extern const char * __progname;                                                 // global name of running executable (argv[0])
@@ -26 +26 @@
 void __assert_fail( const char *assertion, const char *file, unsigned int line, const char *function ) {
         fprintf( stderr, CFA_ASSERT_FMT ".\n", __progname, function, line, file );
-        exit( EXIT_FAILURE );
+        abort();
 }
 
@@ -35 +35 @@
         va_start( args, fmt );
         vfprintf( stderr, fmt, args );
-        exit( EXIT_FAILURE );
+        abort();
 }
 

src/Common/utility.h

@@ -56 +56 @@
 }
 
-
 template< typename Input_iterator >
 void printEnums( Input_iterator begin, Input_iterator end, const char * const *name_array, std::ostream &os ) {