sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A fix for users of Boost 1.35.

Browse source
This commit is contained in:
John Wiegley 2009-02-10 21:14:44 -04:00
parent 557c8af9fe
commit 7de6050269
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/value.h
View file

@ -473,7 +473,11 @@ private:
void set_type(type_t new_type) { void set_type(type_t new_type) {
assert(new_type >= VOID && new_type <= POINTER); assert(new_type >= VOID && new_type <= POINTER);
if (new_type == VOID) { if (new_type == VOID) {
#if BOOST_VERSION >= 103700
storage.reset(); storage.reset();
#else
storage = intrusive_ptr<storage_t>();
#endif
assert(is_null()); assert(is_null());
} else { } else {
_clear(); _clear();
@ -826,16 +830,27 @@ public:
assert(! is_null()); assert(! is_null());
if (! is_sequence()) { if (! is_sequence()) {
#if BOOST_VERSION >= 103700
storage.reset();
#else
storage = intrusive_ptr<storage_t>();
#endif
storage.reset(); storage.reset();
} else { } else {
as_sequence_lval().pop_back(); as_sequence_lval().pop_back();
const sequence_t& seq(as_sequence()); const sequence_t& seq(as_sequence());
std::size_t new_size = seq.size(); std::size_t new_size = seq.size();
if (new_size == 0) if (new_size == 0) {
#if BOOST_VERSION >= 103700
storage.reset(); storage.reset();
else if (new_size == 1) #else
storage = intrusive_ptr<storage_t>();
#endif
}
else if (new_size == 1) {
*this = seq.front(); *this = seq.front();
}
} }
} }