Merge warning fixes from Trunk.

Merge Documentation fixes from Trunk.
Merge updated makefiles from Trunk.

[SVN r78577]
This commit is contained in:
John Maddock
2012-05-24 10:03:48 +00:00
parent 090520dbb4
commit 5964976b93
107 changed files with 3817 additions and 3747 deletions

View File

@ -151,7 +151,7 @@ boost::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k,
--s;
}
else
--pos;
++pos;
}
BOOST_ASSERT(s_data.index[k]->first.get() == result.get());
BOOST_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);