mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 19:20:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ASSERTs from ObjectsContainerImpl.

Browse Source 
The exceptions are good enough and they work correctly for the unittests.
This commit is contained in:
David Capello 2011-11-13 18:00:46 -03:00
parent af26dcaee4
commit e530f977df
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/objects_container_impl.cpp
View File

@ -50,16 +50,12 @@ ObjectId ObjectsContainerImpl::addObject(void* object)
void ObjectsContainerImpl::insertObject(ObjectId id, void* object)
{
std::map<ObjectId, void*>::iterator it1 = m_idToPtr.find(id);
if (it1 != m_idToPtr.end()) {
ASSERT(false && "You've inserted two times the same object");
if (it1 != m_idToPtr.end())
throw ExistentObjectException();
}
std::map<void*, ObjectId>::iterator it2 = m_ptrToId.find(object);
if (it2 != m_ptrToId.end()) {
ASSERT(false && "You've inserted two times the same object");
if (it2 != m_ptrToId.end())
throw ExistentObjectException();
}
m_idToPtr[id] = object;
m_ptrToId[object] = id;
@ -68,17 +64,13 @@ void ObjectsContainerImpl::insertObject(ObjectId id, void* object)
void ObjectsContainerImpl::removeObject(ObjectId id)
{
std::map<ObjectId, void*>::iterator it1 = m_idToPtr.find(id);
if (it1 == m_idToPtr.end()) {
ASSERT(false && "You want to remove a non-existent object");
if (it1 == m_idToPtr.end())
throw ObjectNotFoundException();
}
void* ptr = it1->second;
std::map<void*, ObjectId>::iterator it2 = m_ptrToId.find(ptr);
if (it2 == m_ptrToId.end()) {
ASSERT(false && "You want to remove a non-existent object");
if (it2 == m_ptrToId.end())
throw ObjectNotFoundException();
}
m_idToPtr.erase(it1);
m_ptrToId.erase(it2);
@ -87,10 +79,8 @@ void ObjectsContainerImpl::removeObject(ObjectId id)
void* ObjectsContainerImpl::getObject(ObjectId id)
{
std::map<ObjectId, void*>::iterator it = m_idToPtr.find(id);
if (it == m_idToPtr.end()) {
ASSERT(false && "You want to get information about a non-existent object");
if (it == m_idToPtr.end())
throw ObjectNotFoundException();
}
return it->second;
}