diff options
Diffstat (limited to 'external/glm/Wshadow-windows.patch')
| -rw-r--r-- | external/glm/Wshadow-windows.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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); |