diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2014-11-10 15:05:25 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-12 11:04:11 +0000 |
| commit | da40cac540e7d735edbe9069b3c8ec6af4530208 (patch) | |
| tree | f2abda7281129e13f588c77b18780a7090c8405f /external/glm | |
| parent | bb437029c1e5331bcc3f8fb2fc87837142a52f33 (diff) | |
Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959
Reviewed-on: https://gerrit.libreoffice.org/12164
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.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 be4af10f9896..47a34a77b086 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_);
//////////////////////////////////////
- // Convertion scalar constructors
+ // Conversion scalar constructors
- //! Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
+ //! Explicit conversions (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 c6c9c6585782..fa8c28446c44 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_); ////////////////////////////////////// - // Convertion scalar constructors + // Conversion 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_); ////////////////////////////////////// - // Convertion vector constructors + // Conversion vector constructors @@ -121,19 +121,19 @@ GLM_FUNC_DECL tvec1<T> & operator= (tvec1<U> const & v); |