merge trunk to release

[SVN r86727]
This commit is contained in:
Robert Ramey
2013-11-16 20:13:39 +00:00
parent bda94d16d1
commit b454953f27
148 changed files with 183 additions and 28350 deletions

View File

@@ -43,11 +43,12 @@ basic_serializer_map::type_info_pointer_compare::operator()(
BOOST_ARCHIVE_DECL(bool)
basic_serializer_map::insert(const basic_serializer * bs){
// attempt to insert serializer into it's map
const std::pair<map_type::iterator, bool> result =
m_map.insert(bs);
// the following is commented out - rather than being just
// deleted as a reminder not to try this.
// const std::pair<map_type::iterator, bool> result =
m_map.insert(bs);
// At first it seemed like a good idea. It enforced the
// idea that a type be exported from at most one code module
// (DLL or mainline). This would enforce a "one definition rule"