diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-20 13:03:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-20 18:24:40 +0200 |
| commit | 6ae257e3fc7f07daab1ad8614f934f9027b0a604 (patch) | |
| tree | 125158b76e9558385d5576d9d93a4bd2aa119cc0 /external | |
| parent | tdf#144996 XLSX export: keep permission for editing on save (diff) | |
| download | core-6ae257e3fc7f07daab1ad8614f934f9027b0a604.tar.gz core-6ae257e3fc7f07daab1ad8614f934f9027b0a604.zip | |
upgrade glm to 0.0.9.9.8
Change-Id: I39ca17984cc03de815386343b2f4c4fffd5c861e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123891
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/glm/c++20.patch.0 | 16 | ||||
| -rw-r--r-- | external/glm/clang-cl.patch.0 | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0 index 34a40b5ef4c6..9fdd813a1e53 100644 --- a/external/glm/c++20.patch.0 +++ b/external/glm/c++20.patch.0 @@ -1,11 +1,11 @@ --- glm/detail/type_half.inl +++ glm/detail/type_half.inl @@ -6,7 +6,7 @@ - volatile float f = 1e10; - - for(int i = 0; i < 10; ++i) -- f *= f; // this will overflow before the for loop terminates -+ f = f * f; // this will overflow before the for loop terminates - return f; - } - + volatile float f = 1e10;
+
+ for(int i = 0; i < 10; ++i)
+- f *= f; // this will overflow before the for loop terminates
++ f = f * f; // this will overflow before the for loop terminates
+ return f;
+ }
+
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0 index 44713a1968c5..e5536e145094 100644 --- a/external/glm/clang-cl.patch.0 +++ b/external/glm/clang-cl.patch.0 @@ -3,12 +3,12 @@ --- glm/detail/func_integer.inl +++ glm/detail/func_integer.inl @@ -3,7 +3,9 @@ - #include "_vectorize.hpp" - #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC) - # include <intrin.h> -+#if !defined __clang__^M - # pragma intrinsic(_BitScanReverse) -+#endif - #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC) - #include <limits> - + #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ # include <intrin.h>
++#if !defined __clang__
+ # pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+
|