Bug 11531: Use %zu when printing size_t values in printf and use "friend class" inste...

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24959 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index fb175e7..408c621 100644 (file)
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -9,5 +9,5 @@
 // source have to figure out how to create revision.h just to get a build\r
 // going.  However, if it is not updated, it can be a version behind.\r
 \r
-#define GLSLANG_REVISION "24916"\r
-#define GLSLANG_DATE     "2014/01/20 21:43:23"\r
+#define GLSLANG_REVISION "24957"\r
+#define GLSLANG_DATE     "2014/01/22 16:23:19"\r

diff --git a/glslang/MachineIndependent/PoolAlloc.cpp b/glslang/MachineIndependent/PoolAlloc.cpp
index e88573b..cfc05ee 100644 (file)
--- a/glslang/MachineIndependent/PoolAlloc.cpp
+++ b/glslang/MachineIndependent/PoolAlloc.cpp
@@ -191,7 +191,7 @@ void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, co
             char assertMsg[80];
 
             // We don't print the assert message.  It's here just to be helpful.
-            snprintf(assertMsg, maxSize, "PoolAlloc: Damage %s %lu byte allocation at 0x%p\n",
+            snprintf(assertMsg, maxSize, "PoolAlloc: Damage %s %zu byte allocation at 0x%p\n",
                       locText, size, data());
             assert(0 && "PoolAlloc: Damage in guard block");
         }

diff --git a/glslang/MachineIndependent/reflection.h b/glslang/MachineIndependent/reflection.h
index 430524f..485d72d 100644 (file)
--- a/glslang/MachineIndependent/reflection.h
+++ b/glslang/MachineIndependent/reflection.h
@@ -106,7 +106,7 @@ public:
     void dump();\r
 \r
 protected:\r
-    friend glslang::TLiveTraverser;\r
+    friend class glslang::TLiveTraverser;\r
 \r
     typedef std::map<TString, int> TNameToIndex;\r
     typedef std::vector<TObjectReflection> TMapIndexToReflection;\r