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
@@ -347,7 +347,7 @@ static void InitCharAliases()
 		{ "auxrt",	INTERNAL },
 		{ "auxback",	INTERNAL },

-		{ NULL, 	0 }
+		{ nullptr, 	0 }
 	};

 	int iNextInternalUseCodepoint = 0xE000;