From a192e85345892fa48a2f332aeab7d186b6b0cf8a Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Thu, 29 Sep 2016 13:30:25 +0200 Subject: [PATCH 1/2] Add missing header for size_t in Shader.h This fixes a build error with GCC 6 --- include/SFML/Graphics/Shader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/SFML/Graphics/Shader.h b/include/SFML/Graphics/Shader.h index fb2bc07..c5f5f39 100644 --- a/include/SFML/Graphics/Shader.h +++ b/include/SFML/Graphics/Shader.h @@ -36,6 +36,7 @@ #include #include #include +#include //////////////////////////////////////////////////////////// From 45fe62b7edd5e52e3ea90e12080c7a48d2639712 Mon Sep 17 00:00:00 2001 From: Mika Attila Date: Thu, 29 Sep 2016 13:31:19 +0200 Subject: [PATCH 2/2] Strip trailing whitespace in Shader.h --- include/SFML/Graphics/Shader.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/SFML/Graphics/Shader.h b/include/SFML/Graphics/Shader.h index c5f5f39..003b44e 100644 --- a/include/SFML/Graphics/Shader.h +++ b/include/SFML/Graphics/Shader.h @@ -140,7 +140,7 @@ CSFML_GRAPHICS_API void sfShader_setVec3Uniform(sfShader* shader, const char* na //////////////////////////////////////////////////////////// /// \brief Specify value for \p vec4 uniform /// -/// sfColor objects can be passed to this function via +/// sfColor objects can be passed to this function via /// the use of sfGlslVec4_fromsfColor(sfColor); /// /// \param shader Shader object @@ -193,7 +193,7 @@ CSFML_GRAPHICS_API void sfShader_setIvec3Uniform(sfShader* shader, const char* n //////////////////////////////////////////////////////////// /// \brief Specify value for \p ivec4 uniform /// -/// sfColor objects can be passed to this function via +/// sfColor objects can be passed to this function via /// the use of sfGlslIvec4_fromsfColor(sfColor); /// /// \param shader Shader object @@ -246,7 +246,7 @@ CSFML_GRAPHICS_API void sfShader_setBvec3Uniform(sfShader* shader, const char* n //////////////////////////////////////////////////////////// /// \brief Specify value for \p bvec4 uniform /// -/// sfColor objects can be passed to this function via +/// sfColor objects can be passed to this function via /// the use of sfGlslIvec4_fromsfColor(sfColor); /// /// \param shader Shader object