Merge changes from the Witness.

src/nvtt/tools/cmdline.h

@@ -58,7 +58,7 @@ struct MyAssertHandler : public nv::AssertHandler {
     }
 
     // Handler method, note that func might be NULL!
-    virtual int assertion( const char *exp, const char *file, int line, const char *func ) {
+    virtual int assertion( const char *exp, const char *file, int line, const char *func, const char *msg, va_list arg ) {
         fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
         nv::debug::dumpInfo();
         exit(1);