From 239071c0fae5aba47dd702cb2aa8116f40eb6b98 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Thu, 11 Feb 2010 13:10:12 +0000 Subject: [PATCH] Changed constructors of sf::Window and sf::RenderWindow taking a single parameter to be explicit (to avoid implicit conversions like ^sf::Window w = 0^) git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1402 4e206d99-4929-0410-ac5d-dfc041789085 --- include/SFML/Graphics/RenderWindow.hpp | 2 +- include/SFML/Window/Window.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp index 5adc08ccf..5dc114db4 100644 --- a/include/SFML/Graphics/RenderWindow.hpp +++ b/include/SFML/Graphics/RenderWindow.hpp @@ -89,7 +89,7 @@ public : /// \param settings Additional settings for the underlying OpenGL context /// //////////////////////////////////////////////////////////// - RenderWindow(WindowHandle handle, const ContextSettings& settings = ContextSettings()); + explicit RenderWindow(WindowHandle handle, const ContextSettings& settings = ContextSettings()); //////////////////////////////////////////////////////////// /// \brief Destructor diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp index 6d7729d9f..74d7c9a4f 100644 --- a/include/SFML/Window/Window.hpp +++ b/include/SFML/Window/Window.hpp @@ -103,7 +103,7 @@ public : /// \param settings Additional settings for the underlying OpenGL context /// //////////////////////////////////////////////////////////// - Window(WindowHandle handle, const ContextSettings& settings = ContextSettings()); + explicit Window(WindowHandle handle, const ContextSettings& settings = ContextSettings()); //////////////////////////////////////////////////////////// /// \brief Destructor