From 5707a138d169f6bd18a0767d061fa51de8ab167e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 25 Jan 2013 16:29:26 +0100 Subject: [PATCH] Print also resource key when attempting to overwrite final resource. --- src/ResourceManager.h | 2 +- src/Test/ResourceManagerTest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 0bd806a63..380b2af7a 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -157,7 +157,7 @@ namespace Implementation { /* Cannot change resource with already final state */ CORRADE_ASSERT(it == _data.end() || it->second.state != ResourceDataState::Final, - "ResourceManager::set(): cannot change already final resource", ); + "ResourceManager::set(): cannot change already final resource" << key, ); /* If nothing is referencing reference-counted resource, we're done */ if(policy == ResourcePolicy::ReferenceCounted && (it == _data.end() || it->second.referenceCount == 0)) { diff --git a/src/Test/ResourceManagerTest.cpp b/src/Test/ResourceManagerTest.cpp index 79a2c308f..fb676037d 100644 --- a/src/Test/ResourceManagerTest.cpp +++ b/src/Test/ResourceManagerTest.cpp @@ -162,7 +162,7 @@ void ResourceManagerTest::basic() { Error::setOutput(&out); rm.set(answerKey, new std::int32_t(43), ResourceDataState::Mutable, ResourcePolicy::Resident); CORRADE_COMPARE(*theAnswer, 42); - CORRADE_COMPARE(out.str(), "ResourceManager::set(): cannot change already final resource\n"); + CORRADE_COMPARE(out.str(), "ResourceManager::set(): cannot change already final resource " + answerKey.hexString() + '\n'); /* But non-final can be changed */ rm.set(questionKey, new std::int32_t(20), ResourceDataState::Final, ResourcePolicy::Resident);