From 4e9d8c3171f39ed3db96576fdbfc50b31f3d831b Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Sun, 26 Jan 2014 07:56:43 +0000
Subject: [PATCH] x86 (32-bit) fix for last g++ fix.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25018 e7fa87d3-cd2b-0410-9028-fcbf551c1848
---
glslang/Include/InfoSink.h | 4 ++--
glslang/Include/revision.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/glslang/Include/InfoSink.h b/glslang/Include/InfoSink.h
index 3d31168ad..c0a275d5e 100644
--- a/glslang/Include/InfoSink.h
+++ b/glslang/Include/InfoSink.h
@@ -73,8 +73,8 @@ public:
TInfoSinkBase& operator<<(char c) { append(1, c); return *this; }
TInfoSinkBase& operator<<(const char* s) { append(s); return *this; }
TInfoSinkBase& operator<<(int n) { append(String(n)); return *this; }
- TInfoSinkBase& operator<<(const unsigned int n) { append(String(n)); return *this; }
- TInfoSinkBase& operator<<(size_t n) { append(String(n)); return *this; }
+ TInfoSinkBase& operator<<(unsigned int n) { append(String(n)); return *this; }
+ TInfoSinkBase& operator<<(long unsigned int n) { append(String(n)); return *this; }
TInfoSinkBase& operator<<(float n) { const int size = 40; char buf[size];
snprintf(buf, size, (fabs(n) > 1e-8 && fabs(n) < 1e8) || n == 0.0f ? "%f" : "%g", n);
append(buf);
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index a471382bf..4898dee06 100644
--- 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
// going. However, if it is not updated, it can be a version behind.
-#define GLSLANG_REVISION "24977"
-#define GLSLANG_DATE "2014/01/23 14:40:33"
+#define GLSLANG_REVISION "25015"
+#define GLSLANG_DATE "2014/01/25 18:44:34"
--
GitLab