diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2014-11-15 00:54:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-15 15:38:05 +0000 |
| commit | 702d14d954d5dcb88e70cfad8517118f9614c987 (patch) | |
| tree | f540a12334eac7c96b832f99617cb8384b790e37 /external/glm | |
| parent | c8b07093f104ff4297f6a2bfbc363fd640374f18 (diff) | |
Partial revert of da40cac540e7d735edbe9069b3c8ec6af4530208
As requested from Michael Stahl here:
https://gerrit.libreoffice.org/#/c/12164/
Change-Id: Ie00bc789c1dfa3f0049c8915e0deeac7fab6e0fd
Reviewed-on: https://gerrit.libreoffice.org/12432
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/glm')
| -rw-r--r-- | external/glm/Wshadow-unix.patch | 4 | ||||
| -rw-r--r-- | external/glm/Wshadow-windows.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch index 47a34a77b086..be4af10f9896 100644 --- a/external/glm/Wshadow-unix.patch +++ b/external/glm/Wshadow-unix.patch @@ -52,9 +52,9 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL tvec1(tref1<T> const & r_);
//////////////////////////////////////
- // Conversion scalar constructors
+ // Convertion scalar constructors
- //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
+ //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
template <typename U>
- GLM_FUNC_DECL explicit tvec1(U const & s);
+ GLM_FUNC_DECL explicit tvec1(U const & s_);
diff --git a/external/glm/Wshadow-windows.patch b/external/glm/Wshadow-windows.patch index fa8c28446c44..c6c9c6585782 100644 --- a/external/glm/Wshadow-windows.patch +++ b/external/glm/Wshadow-windows.patch @@ -52,7 +52,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL tvec1(tref1<T> const & r_); ////////////////////////////////////// - // Conversion scalar constructors + // Convertion scalar constructors //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template <typename U> @@ -60,7 +60,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp + GLM_FUNC_DECL explicit tvec1(U const & s_); ////////////////////////////////////// - // Conversion vector constructors + // Convertion vector constructors @@ -121,19 +121,19 @@ GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v); |