From 72207a63ef04be84ec3ff97544d6bd4e72c4f1d4 Mon Sep 17 00:00:00 2001 From: ZXShady <153229951+ZXShady@users.noreply.github.com> Date: Sat, 5 Oct 2024 06:31:46 +0100 Subject: [PATCH] Use inherited constructors instead of constructor delegation sf::Exception can use the inheriting constructors functionality instead of a constructor delegating to the parent constructor. I removed Exception.cpp as it is not needed anymore. --- include/SFML/System/Exception.hpp | 8 +------ src/SFML/System/CMakeLists.txt | 1 - src/SFML/System/Exception.cpp | 38 ------------------------------- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/SFML/System/Exception.cpp diff --git a/include/SFML/System/Exception.hpp b/include/SFML/System/Exception.hpp index 2f3b2f28f..a72e7e7a9 100644 --- a/include/SFML/System/Exception.hpp +++ b/include/SFML/System/Exception.hpp @@ -41,12 +41,6 @@ namespace sf class SFML_SYSTEM_API Exception : public std::runtime_error { public: - //////////////////////////////////////////////////////////// - /// \brief Construct with message - /// - /// \param message Exception message - /// - //////////////////////////////////////////////////////////// - explicit Exception(const std::string& message); + using std::runtime_error::runtime_error; }; } // namespace sf diff --git a/src/SFML/System/CMakeLists.txt b/src/SFML/System/CMakeLists.txt index 0681000b2..3f313f6aa 100644 --- a/src/SFML/System/CMakeLists.txt +++ b/src/SFML/System/CMakeLists.txt @@ -10,7 +10,6 @@ set(SRC ${SRCROOT}/EnumArray.hpp ${SRCROOT}/Err.cpp ${INCROOT}/Err.hpp - ${SRCROOT}/Exception.cpp ${INCROOT}/Exception.hpp ${INCROOT}/Export.hpp ${INCROOT}/InputStream.hpp diff --git a/src/SFML/System/Exception.cpp b/src/SFML/System/Exception.cpp deleted file mode 100644 index 45d16ac24..000000000 --- a/src/SFML/System/Exception.cpp +++ /dev/null @@ -1,38 +0,0 @@ -//////////////////////////////////////////////////////////// -// -// SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org) -// -// This software is provided 'as-is', without any express or implied warranty. -// In no event will the authors be held liable for any damages arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it freely, -// subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; -// you must not claim that you wrote the original software. -// If you use this software in a product, an acknowledgment -// in the product documentation would be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, -// and must not be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source distribution. -// -//////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////// -// Headers -//////////////////////////////////////////////////////////// -#include - - -namespace sf -{ -//////////////////////////////////////////////////////////// -Exception::Exception(const std::string& message) : std::runtime_error(message) -{ -} - -} // namespace sf