diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-10 16:31:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-10 16:31:09 +0200 |
| commit | 7f545208e8108be84cd880e026294e11aa15c65b (patch) | |
| tree | 28f1fc9c121c1bf0c02efe123d4a7d42df8f8299 | |
| parent | e60183503e0cefd567f20b300d674fcbd75f1fb5 (diff) | |
external/glm: -Werror,-Wsign-compare
Change-Id: I5acb672ea8387cdbf68677a2b46d21785148a735
| -rw-r--r-- | external/glm/UnpackedTarball_glm.mk | 1 | ||||
| -rw-r--r-- | external/glm/Wsign-compare.patch.0 | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index ff9c998c7daa..86e9d162b40e 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 000000000000..ef97121ff97f --- /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;
+ }
|