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

[Tor Lillqvist]

 external/glm/UnpackedTarball_glm.mk  |    1 +
 external/glm/Wunused-parameter.patch |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 142dbf27c10535af51f2c722d9166b59e550aa22
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 24 17:50:01 2014 +0300

    WaE: unused parameter
    
    Change-Id: Ifcdef5ed474b36e60604dde96bba4dd152e829b6

diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk
index 86e9d16..82f4a2c 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -18,6 +18,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 \
+    external/glm/Wunused-parameter.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wunused-parameter.patch b/external/glm/Wunused-parameter.patch
new file mode 100644
index 0000000..de12397
--- /dev/null
+++ b/external/glm/Wunused-parameter.patch
@@ -0,0 +1,18 @@
+--- glm/glm/gtx/bit.inl
++++ glm/glm/gtx/bit.inl
+@@ -572,6 +572,7 @@
+ 		int const & ToBit
+ 	)
+ 	{
++		(void) FromBit;
+ 		assert(FromBit <= ToBit);
+ 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+ 
+@@ -589,6 +589,7 @@
+ 		int const & ToBit
+ 	)
+ 	{
++		(void) FromBit;
+ 		assert(FromBit <= ToBit);
+ 		assert(ToBit <= sizeof(genIUType) * std::size_t(8));
+