diff options
| author | John Wiegley <johnw@newartisans.com> | 2007-05-19 02:59:05 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-04-13 03:38:53 -0400 |
| commit | 565d8eeb876e69a38076033cdd09c89e8f10940b (patch) | |
| tree | 4f90e66bde53711e8d0c741592a0c717dab6baea /src/value.cc | |
| parent | 7ddf6baf2c741f631dbbb4491d3cc21c648f80bf (diff) | |
| download | ledger-565d8eeb876e69a38076033cdd09c89e8f10940b.tar.gz ledger-565d8eeb876e69a38076033cdd09c89e8f10940b.tar.bz2 ledger-565d8eeb876e69a38076033cdd09c89e8f10940b.zip | |
Changed the value object to allocate its larger members.
Diffstat (limited to 'src/value.cc')
| -rw-r--r-- | src/value.cc | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/src/value.cc b/src/value.cc index 88b8949e..25145695 100644 --- a/src/value.cc +++ b/src/value.cc @@ -44,16 +44,16 @@ void value_t::storage_t::destroy() ((amount_t *)data)->~amount_t(); break; case BALANCE: - ((balance_t *)data)->~balance_t(); + checked_delete(*(balance_t **)data); break; case BALANCE_PAIR: - ((balance_pair_t *)data)->~balance_pair_t(); + checked_delete(*(balance_pair_t **)data); break; case STRING: ((string *)data)->~string(); break; case SEQUENCE: - ((sequence_t *)data)->~sequence_t(); + checked_delete(*(sequence_t **)data); break; case POINTER: ((boost::any *)data)->~any(); @@ -67,6 +67,10 @@ void value_t::storage_t::destroy() void value_t::initialize() { +#if 0 + LOGGER("value.initialize"); +#endif + true_value = new storage_t; true_value->type = BOOLEAN; *(bool *) true_value->data = true; @@ -74,6 +78,38 @@ void value_t::initialize() false_value = new storage_t; false_value->type = BOOLEAN; *(bool *) false_value->data = false; + + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(bool)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(moment_t)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(long)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(amount_t)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(balance_t *)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(balance_pair_t *)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(string)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(sequence_t *)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(xml::node_t *)); + BOOST_STATIC_ASSERT(sizeof(amount_t) >= sizeof(boost::any)); + +#if 0 + DEBUG_(std::setw(3) << std::right << sizeof(bool) + << " sizeof(bool)"); + DEBUG_(std::setw(3) << std::right << sizeof(moment_t) + << " sizeof(moment_t)"); + DEBUG_(std::setw(3) << std::right << sizeof(long) + << " sizeof(long)"); + DEBUG_(std::setw(3) << std::right << sizeof(amount_t) + << " sizeof(amount_t)"); + DEBUG_(std::setw(3) << std::right << sizeof(balance_t *) + << " sizeof(balance_t *)"); + DEBUG_(std::setw(3) << std::right << sizeof(balance_pair_t *) + << " sizeof(balance_pair_t *)"); + DEBUG_(std::setw(3) << std::right << sizeof(string) + << " sizeof(string)"); + DEBUG_(std::setw(3) << std::right << sizeof(sequence_t *) + << " sizeof(sequence_t *)"); + DEBUG_(std::setw(3) << std::right << sizeof(boost::any) + << " sizeof(boost::any)"); +#endif } void value_t::shutdown() |