Changeset d6c1dd0

Timestamp:

Aug 1, 2017, 11:58:44 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

ff56efdf

Parents:

5c80197

Message:

formatting and add attribute "format" to C++ assert_fail_f

Location:

src

Files:

• include/assert.h (modified) (2 diffs)
• libcfa/stdhdr/assert.h (modified) (2 diffs)

src/include/assert.h

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:19:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 18 13:25:55 2016
-// Update Count     : 4
+// Last Modified On : Tue Aug  1 11:56:01 2017
+// Update Count     : 16
 //
 
@@ -22 +22 @@
 #define __STRINGIFY__(str) #str
 #define __VSTRINGIFY__(str) __STRINGIFY__(str)
-#define assertf(expr, fmt, ...) ((expr) ? static_cast<void>(0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
+#define assertf( expr, fmt, ... ) ((expr) ? static_cast<void>(0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
 
-void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn));
+void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn, format( printf, 5, 6) ));
 
 template<typename T, typename U>
-static inline T safe_dynamic_cast(const U& src) {
+static inline T safe_dynamic_cast( const U & src ) {
         T ret = dynamic_cast<T>(src);
         assert(ret);

src/libcfa/stdhdr/assert.h

@@ -10 +10 @@
 // Created On       : Mon Jul  4 23:25:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 31 14:52:43 2017
-// Update Count     : 12
+// Last Modified On : Mon Jul 31 23:09:32 2017
+// Update Count     : 13
 // 
 
@@ -25 +25 @@
         #define __STRINGIFY__(str) #str
         #define __VSTRINGIFY__(str) __STRINGIFY__(str)
-        #define assertf(expr, fmt, ...) ((expr) ? ((void)0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
-        void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn, format(printf, 5, 6)));
+        #define assertf( expr, fmt, ... ) ((expr) ? ((void)0) : __assert_fail_f(__VSTRINGIFY__(expr), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ## __VA_ARGS__ ))
+
+        void __assert_fail_f( const char *assertion, const char *file, unsigned int line, const char *function, const char *fmt, ... ) __attribute__((noreturn, format( printf, 5, 6) ));
 #endif