diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2013-10-19 08:57:20 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-10-19 08:57:20 +0200 |
commit | ed6115361006240e3c7b02295599e4534cc55a13 (patch) | |
tree | 612f12d6c7c49421102041fceb7609db8ab8257e /cutl/details/boost/regex/pending/object_cache.hpp | |
parent | af8d1a0139ca105c6830f4ac7c320aca2e1c1f5e (diff) |
Update internal Boost subset to 1.54.0
Diffstat (limited to 'cutl/details/boost/regex/pending/object_cache.hpp')
-rw-r--r-- | cutl/details/boost/regex/pending/object_cache.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cutl/details/boost/regex/pending/object_cache.hpp b/cutl/details/boost/regex/pending/object_cache.hpp index 7a213a9..2bf2754 100644 --- a/cutl/details/boost/regex/pending/object_cache.hpp +++ b/cutl/details/boost/regex/pending/object_cache.hpp @@ -73,7 +73,7 @@ cutl_details_boost::shared_ptr<Object const> object_cache<Key, Object>::get(cons // for now just throw, but we should never really get here... // ::cutl_details_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 cutl_details_boost::shared_ptr<Object>(); #endif #else @@ -151,7 +151,7 @@ cutl_details_boost::shared_ptr<Object const> object_cache<Key, Object>::do_get(c --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); |