Bug 11531: Use %zu when printing size_t values in printf and use "friend class" instead of "friend".
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24959 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
28b95b682c
commit
f4d6634713
@ -9,5 +9,5 @@
|
||||
// source have to figure out how to create revision.h just to get a build
|
||||
// going. However, if it is not updated, it can be a version behind.
|
||||
|
||||
#define GLSLANG_REVISION "24916"
|
||||
#define GLSLANG_DATE "2014/01/20 21:43:23"
|
||||
#define GLSLANG_REVISION "24957"
|
||||
#define GLSLANG_DATE "2014/01/22 16:23:19"
|
||||
|
@ -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");
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public:
|
||||
void dump();
|
||||
|
||||
protected:
|
||||
friend glslang::TLiveTraverser;
|
||||
friend class glslang::TLiveTraverser;
|
||||
|
||||
typedef std::map<TString, int> TNameToIndex;
|
||||
typedef std::vector<TObjectReflection> TMapIndexToReflection;
|
||||
|
Loading…
x
Reference in New Issue
Block a user