summaryrefslogtreecommitdiffstats
path: root/src/common/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/util')
-rw-r--r--src/common/util/CountedPtr.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/common/util/CountedPtr.h b/src/common/util/CountedPtr.h
index 0886bf36..10c724c5 100644
--- a/src/common/util/CountedPtr.h
+++ b/src/common/util/CountedPtr.h
@@ -86,15 +86,16 @@ public:
// Fail if this is not a valid cast
if (y) {
#ifdef WITH_RTTI
- T* const unused_variable = dynamic_cast<T* const>(y._counter->ptr);
+ T* const casted_y = dynamic_cast<T* const>(y._counter->ptr);
#else
- T* const unused_variable = static_cast<T* const>(y._counter->ptr);
+ T* const casted_y = static_cast<T* const>(y._counter->ptr);
#endif
- assert(unused_variable == y._counter->ptr); // shuts up gcc
+ if (casted_y != NULL) {
+ assert(casted_y == y._counter->ptr);
+ //release(); // FIXME: leak?
+ retain((Counter*)y._counter);
+ }
}
-
- //release();
- retain((Counter*)y._counter);
}
/** Assign to the value of a CountedPtr of the same type. */