Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -77,7 +77,7 @@ static void term_destination (jpeg::j_compress_ptr cinfo)
 */
 static void jpeg_RageFile_dest( jpeg::j_compress_ptr cinfo, RageFile &f )
 {
-	ASSERT( cinfo->dest == NULL );
+	ASSERT( cinfo->dest == nullptr );

 	cinfo->dest = (struct jpeg::jpeg_destination_mgr *)
 		(*cinfo->mem->alloc_small) ( (jpeg::j_common_ptr) cinfo, JPOOL_PERMANENT,