From b7bcf0dc5903f30a867d57b5b5189269d6ff4d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 30 Jul 2013 23:09:58 +0200 Subject: [PATCH] Simplified internal ResourceManager::free() implementation. No need to explicitly create all the pointers and then juggle with `std::common_type<>` and whatnot. --- src/ResourceManager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ResourceManager.h b/src/ResourceManager.h index acb3a1553..6038d32dd 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -348,7 +348,7 @@ template class ResourceManager: private Implementation::Resource * @return Pointer to self (for method chaining) */ ResourceManager* free() { - freeInternal(std::common_type()...); + freeInternal(); return this; } @@ -374,11 +374,11 @@ template class ResourceManager: private Implementation::Resource } private: - template void freeInternal(std::common_type, std::common_type... t) { + template void freeInternal() { free(); - freeInternal(t...); + freeInternal(); } - void freeInternal() const {} + template void freeInternal() const {} static ResourceManager*& internalInstance(); };