diff --git a/src/global.hpp b/src/global.hpp index eceb53031f5..42b1c61104f 100644 --- a/src/global.hpp +++ b/src/global.hpp @@ -28,11 +28,6 @@ #error "Compilation with NDEBUG defined isn't supported, Wesnoth depends on asserts." #endif -// To allow using some optional C++20 features -#if __cplusplus >= 202002L -#define HAVE_CXX20 -#endif - #if defined(__clang__) #endif diff --git a/src/picture.cpp b/src/picture.cpp index 649baadd3b3..e1cbcfcda92 100644 --- a/src/picture.cpp +++ b/src/picture.cpp @@ -79,11 +79,7 @@ class cache_type public: bool in_cache(const locator& item) const { -#ifdef HAVE_CXX20 - return content_.contains(item); -#else - return content_.find(item) != content_.end(); -#endif + return content_.find(item) != content_.end(); // TODO C++20: use content_.contains() } /** Returns a pointer to the cached value, or nullptr if not found. */