Merge to release

[SVN r63784]
This commit is contained in:
Robert Ramey
2010-07-09 18:23:21 +00:00
parent e30258f8e6
commit 7357aa1736
39 changed files with 737 additions and 180 deletions

View File

@@ -94,7 +94,10 @@ basic_serializer_map::find(
const basic_serializer_arg bs(eti);
map_type::const_iterator it;
it = m_map.find(& bs);
assert(it != m_map.end());
if(it == m_map.end()){
assert(false);
return 0;
}
return *it;
}