Apply patches from #5462.

Add new test case to verify patches are actually working and prevent future breakage!
Fixes #5462.

[SVN r71240]
This commit is contained in:
John Maddock
2011-04-14 07:53:28 +00:00
parent 3ce59d3bbd
commit 337f7036df
6 changed files with 89 additions and 7 deletions

View File

@ -73,7 +73,7 @@ boost::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k, siz
// for now just throw, but we should never really get here...
//
::boost::throw_exception(std::runtime_error("Error in thread safety code: could not acquire a lock"));
#ifdef BOOST_NO_UNREACHABLE_RETURN_DETECTION
#if defined(BOOST_NO_UNREACHABLE_RETURN_DETECTION) || defined(BOOST_NO_EXCEPTIONS)
return boost::shared_ptr<Object>();
#endif
#else