diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-09 16:44:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-09 16:44:18 +0100 |
| commit | 67d7ba55a007cc11bc291a6e97b1fdcc2cc1bad1 (patch) | |
| tree | 654fadf1effa981f66ad76a015f91bf09d826540 /external | |
| parent | 37280590cdb0a0654a6c618eb06f67aa48b27f31 (diff) | |
Revert "Fix common typos. No automatic tools. Handmade…"
This reverts commit 759c4d18d57b06dcc26fb82759599a29c61ef853, every part of it
is wrong.
Diffstat (limited to 'external')
| -rw-r--r-- | external/glm/Wshadow-unix.patch | 4 | ||||
| -rw-r--r-- | external/glm/Wshadow-windows.patch | 4 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/cmake.patch | 2 |
3 files changed, 5 insertions, 5 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); diff --git a/external/mysqlcppconn/patches/cmake.patch b/external/mysqlcppconn/patches/cmake.patch index a856c213076a..79fe064fc8e6 100644 --- a/external/mysqlcppconn/patches/cmake.patch +++ b/external/mysqlcppconn/patches/cmake.patch @@ -127,7 +127,7 @@ diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT - ENDIF(STLPORT_INCLUDE_DIR) - - # We want to set the inclusion of the library globally -- ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but CMake manual says I can!! ;) +- ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake manual says I can!! ;) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -library=stlport4") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -library=stlport4") - SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -library=stlport4") |