[Libreoffice-commits] core.git: external/glm

[Stephan Bergmann]

 external/glm/UnpackedTarball_glm.mk |    1 +
 external/glm/Wsign-compare.patch.0  |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 7f545208e8108be84cd880e026294e11aa15c65b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 10 16:31:09 2014 +0200

    external/glm: -Werror,-Wsign-compare
    
    Change-Id: I5acb672ea8387cdbf68677a2b46d21785148a735

diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk
index ff9c998..86e9d16 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,glm, \
     external/glm/Wshadow-patch-fix.patch \
+    external/glm/Wsign-compare.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wsign-compare.patch.0 b/external/glm/Wsign-compare.patch.0
new file mode 100644
index 0000000..ef97121
--- /dev/null
+++ b/external/glm/Wsign-compare.patch.0
@@ -0,0 +1,20 @@
+--- glm/gtx/bit.inl
++++ glm/gtx/bit.inl
+@@ -576,7 +576,7 @@
+ 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+ 
+ 		genIUType Result = Value;
+-		for(std::size_t i = 0; i <= ToBit; ++i)
++		for(int i = 0; i <= ToBit; ++i)
+ 			Result |= (1 << i);
+ 		return Result;
+ 	}
+@@ -593,7 +593,7 @@
+ 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+ 
+ 		genIUType Result = Value;
+-		for(std::size_t i = 0; i <= ToBit; ++i)
++		for(int i = 0; i <= ToBit; ++i)
+ 			Result &= ~(1 << i);
+ 		return Result;
+ 	}