From 3c404128c4669a1f4f190e20a89553677717fc50 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Sep 2016 22:01:44 +0300 Subject: Add missing comments into defines. --- src/resources/resourcemanager/resourcemanager.cpp | 55 +++++++++++++--------- src/resources/resourcemanager/resourcemanager.h | 4 +- .../resourcemanager/resourcemanager_unittest.cc | 6 ++- 3 files changed, 39 insertions(+), 26 deletions(-) (limited to 'src/resources/resourcemanager') diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 765790aac..8f7de4e69 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -40,7 +40,7 @@ #ifndef USE_OPENGL #include -#endif +#endif // USE_OPENGL #include #include @@ -71,7 +71,8 @@ ResourceManager::~ResourceManager() #ifdef DEBUG_LEAKS #ifdef UNITTESTS bool status(false); -#endif +#endif // UNITTESTS + while (iter != mResources.end()) { if (iter->second) @@ -83,7 +84,7 @@ ResourceManager::~ResourceManager() toString(iter->second->getRefCount())).append(")")); #ifdef UNITTESTS status = true; -#endif +#endif // UNITTESTS } } ++iter; @@ -92,10 +93,10 @@ ResourceManager::~ResourceManager() #ifdef UNITTESTS if (status) reportAlways("Found leaked resources."); -#endif +#endif // UNITTESTS iter = mResources.begin(); -#endif +#endif // DEBUG_LEAKS while (iter != mResources.end()) { @@ -105,7 +106,8 @@ ResourceManager::~ResourceManager() ++iter; continue; } -#endif +#endif // DEBUG_LEAKS + if (dynamic_cast(iter->second)) { cleanUp(iter->second); @@ -129,7 +131,8 @@ ResourceManager::~ResourceManager() ++iter; continue; } -#endif +#endif // DEBUG_LEAKS + if (dynamic_cast(iter->second)) { cleanUp(iter->second); @@ -153,7 +156,8 @@ ResourceManager::~ResourceManager() ++iter; continue; } -#endif +#endif // DEBUG_LEAKS + if (iter->second) { cleanUp(iter->second); @@ -193,7 +197,7 @@ void ResourceManager::cleanUp(Resource *const res) delete res; #ifdef DEBUG_LEAKS cleanOrphans(true); -#endif +#endif // DEBUG_LEAKS } void ResourceManager::cleanProtected() @@ -286,9 +290,10 @@ void ResourceManager::logResource(const Resource *const res) src.append(" ").append(toString(count)); logger->log("resource(%s) %s", res->mIdPath.c_str(), src.c_str()); } -#else +#else // USE_OPENGL + logger->log("resource(%s)", res->mIdPath.c_str()); -#endif +#endif // USE_OPENGL } void ResourceManager::clearDeleted(const bool full) @@ -420,7 +425,8 @@ bool ResourceManager::addResource(const std::string &idPath, #ifdef DEBUG_IMAGES logger->log("set name %p, %s", static_cast(resource), resource->mIdPath.c_str()); -#endif +#endif // DEBUG_IMAGES + mResources[idPath] = resource; return true; } @@ -494,14 +500,16 @@ Resource *ResourceManager::get(const std::string &idPath, #ifdef DEBUG_IMAGES logger->log("set name %p, %s", static_cast(resource), resource->mIdPath.c_str()); -#endif +#endif // DEBUG_IMAGES + mResources[idPath] = resource; } else { reportAlways("Error loading image: %s", idPath.c_str()); } -#else +#else // DISABLE_RESOURCE_CACHING + Resource *resource = fun(data, idPath); if (resource) @@ -511,13 +519,13 @@ Resource *ResourceManager::get(const std::string &idPath, #ifdef DEBUG_IMAGES logger->log("set name %p, %s", static_cast(resource), resource->mIdPath.c_str()); -#endif +#endif // DEBUG_IMAGES } else { reportAlways("Error loading image: " + idPath); } -#endif +#endif // DISABLE_RESOURCE_CACHING // Returns nullptr if the object could not be created. return resource; @@ -565,9 +573,10 @@ void ResourceManager::release(Resource *const res) mOrphanedResources.insert(*resIter); mResources.erase(resIter); -#else +#else // DISABLE_RESOURCE_CACHING + delete res; -#endif +#endif // DISABLE_RESOURCE_CACHING } void ResourceManager::moveToDeleted(Resource *const res) @@ -648,7 +657,8 @@ void ResourceManager::deleteInstance() #ifdef UNITTESTS bool status(false); -#endif +#endif // UNITTESTS + while (iter != resourceManager->mResources.end()) { const Resource *const res = iter->second; @@ -661,7 +671,7 @@ void ResourceManager::deleteInstance() res->getRefCount())).append(")")); #ifdef UNITTESTS status = true; -#endif +#endif // UNITTESTS } } ++iter; @@ -669,9 +679,10 @@ void ResourceManager::deleteInstance() #ifdef UNITTESTS if (status) reportAlways("Found leaked resources."); -#endif +#endif // UNITTESTS } -#endif +#endif // DUMP_LEAKED_RESOURCES + delete2(resourceManager); } diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index 6d2f12b37..f63677d85 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -160,7 +160,7 @@ class ResourceManager final : public MemoryCounter Resources* getOrphanedResources() A_WARN_UNUSED { return &mOrphanedResources; } -#endif +#endif // DEBUG_DUMP_LEAKS bool cleanOrphans(const bool always = false); @@ -183,7 +183,7 @@ class ResourceManager final : public MemoryCounter #ifndef UNITTESTS private: -#endif +#endif // UNITTESTS /** * Deletes the resource after logging a cleanup message. */ diff --git a/src/resources/resourcemanager/resourcemanager_unittest.cc b/src/resources/resourcemanager/resourcemanager_unittest.cc index ec5e3b0d9..10f61c200 100644 --- a/src/resources/resourcemanager/resourcemanager_unittest.cc +++ b/src/resources/resourcemanager/resourcemanager_unittest.cc @@ -103,9 +103,11 @@ TEST_CASE("resourcemanager", "resourcemanager") SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE)); -#else +#else // USE_SDL2 + graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); -#endif +#endif // USE_SDL2 + ActorSprite::load(); resourceManager = new ResourceManager; testResouceCounter = 0; -- cgit v1.2.3-60-g2f50