Applied changes suggested by Christoph Hertzberg to c'tor leak fix.

- Enclose exception handling in '#ifdef EIGEN_EXCEPTIONS'.
- Use an object counter to demonstrate the bug more readily.
This commit is contained in:
Moritz Klammler
2014-07-18 23:19:56 +02:00
parent 58687aa5e6
commit 529e6cb552
2 changed files with 51 additions and 1 deletions

View File

@@ -4,11 +4,30 @@
struct Foo
{
static unsigned object_count;
static unsigned object_limit;
int dummy;
Foo() { if (!internal::random(0, 10)) throw Foo::Fail(); }
Foo()
{
#ifdef EIGEN_EXCEPTIONS
// TODO: Is this the correct way to handle this?
if (Foo::object_count > Foo::object_limit) { throw Foo::Fail(); }
#endif
++Foo::object_count;
}
~Foo()
{
--Foo::object_count;
}
class Fail : public std::exception {};
};
unsigned Foo::object_count = 0;
unsigned Foo::object_limit = 0;
namespace Eigen
{
template<>
@@ -34,10 +53,17 @@ namespace Eigen
void test_ctorleak()
{
Foo::object_count = 0;
Foo::object_limit = internal::random(0, 14 * 92 - 2);
#ifdef EIGEN_EXCEPTIONS
try
#endif
{
Matrix<Foo, Dynamic, Dynamic> m(14, 92);
eigen_assert(false); // not reached
}
#ifdef EIGEN_EXCEPTIONS
catch (const Foo::Fail&) { /* ignore */ }
#endif
VERIFY_IS_EQUAL(static_cast<unsigned>(0), Foo::object_count);
}