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
@@ -37,7 +37,7 @@ namespace GraphicsWindow
 	HWND GetHwnd();

 	//dwm functions for vista+
-	static HINSTANCE hInstanceDwmapi = NULL;
+	static HINSTANCE hInstanceDwmapi = nullptr;
 	static HRESULT(WINAPI* PFN_DwmIsCompositionEnabled)(BOOL*);
 	static HRESULT (WINAPI* PFN_DwmFlush)(VOID);
 };