From 3784ca94cfba18066b194981bb610b2d1f138faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 Aug 2023 22:42:35 +0200 Subject: [PATCH] Amazing, now I get swap() conflicts from the other side, F.F.S. This one is because ResourceKey is derived from a HashDigest class in Corrade::Utility, where the new swap() implementation is. C++!!! --- src/Magnum/Resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index e779606e0..6474bb041 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -271,7 +271,7 @@ template Resource::Resource(Resource&& other) noex } template Resource& Resource::operator=(Resource&& other) noexcept { - using std::swap; + using Utility::swap; swap(_manager, other._manager); swap(_key, other._key); swap(_lastCheck, other._lastCheck);