Merge from trunk to release

[SVN r68305]
This commit is contained in:
Robert Ramey
2011-01-19 18:31:02 +00:00
parent 1014408275
commit 7c7b067dfe
16 changed files with 81 additions and 62 deletions

View File

@@ -99,7 +99,7 @@ basic_serializer_map::find(
map_type::const_iterator it;
it = m_map.find(& bs);
if(it == m_map.end()){
assert(false);
BOOST_ASSERT(false);
return 0;
}
return *it;