From ed6115361006240e3c7b02295599e4534cc55a13 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 19 Oct 2013 08:57:20 +0200 Subject: Update internal Boost subset to 1.54.0 --- cutl/details/boost/regex/pending/object_cache.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cutl/details/boost/regex/pending/object_cache.hpp') 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_cache::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(); #endif #else @@ -151,7 +151,7 @@ cutl_details_boost::shared_ptr object_cache::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); -- cgit v1.1