Merge branch 'cpp-headers'

2016-08-11 10:00:57 -06:00
parent 10e0efeb42 66ec80e01b
commit 2c6038ecf1
28 changed files with 57 additions and 70 deletions
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -43,7 +43,7 @@

 #include "../glslang/OSDependent/osinclude.h"

-#include <stdarg.h>
+#include <cstdarg>
 #include <algorithm>

 namespace glslang {