From fca95e5d454d37bd74b98f5bce35cfcbaee86c3f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 9 Sep 2006 14:24:56 +0000 Subject: Drove 'er home! Working monolothic Ingenuity (ie. in-process engine). Countless bugfixes. git-svn-id: http://svn.drobilla.net/lad/ingen@123 a436a847-0d15-0410-975c-d299462d15a1 --- src/common/util/CountedPtr.h | 6 +----- src/common/util/Queue.h | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/common/util') diff --git a/src/common/util/CountedPtr.h b/src/common/util/CountedPtr.h index 16eb0eee..c5eb2e50 100644 --- a/src/common/util/CountedPtr.h +++ b/src/common/util/CountedPtr.h @@ -87,13 +87,9 @@ public: // Fail if this is not a valid cast if (y) { -#ifdef WITH_RTTI T* const casted_y = dynamic_cast(y._counter->ptr); -#else - T* const casted_y = static_cast(y._counter->ptr); -#endif + if (casted_y) { - assert(casted_y == y._counter->ptr); //release(); // FIXME: leak? retain((Counter*)y._counter); assert(_counter == (Counter*)y._counter); diff --git a/src/common/util/Queue.h b/src/common/util/Queue.h index 10c7f0f5..a4c34222 100644 --- a/src/common/util/Queue.h +++ b/src/common/util/Queue.h @@ -66,6 +66,7 @@ Queue::Queue(size_t size) m_size(size+1), m_objects((T*)calloc(m_size, sizeof(T))) { + assert(size > 1); } @@ -147,6 +148,7 @@ inline T& Queue::pop() { assert(!is_empty()); + assert(m_size > 0); T& r = m_objects[m_front]; m_front = (m_front + 1) % (m_size); -- cgit v1.2.1