boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-22 16:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and testing update for MSVC in C++20 mode.

Browse Source
This commit is contained in:
jzmaddock
2021-03-07 08:42:18 +00:00
parent e74d65810e
commit 92fe5dd4d6
6 changed files with 103 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
include/boost/regex/pending/object_cache.hpp
View File

@ -21,167 +21,9 @@
#include <boost/regex/config.hpp>
#ifdef BOOST_REGEX_CXX03
#include <boost/shared_ptr.hpp>
#define BOOST_REGEX_SHARED_PTR_NS boost
#include <boost/regex/v4/object_cache.hpp>
#else
#include <memory>
#define BOOST_REGEX_SHARED_PTR_NS std
#endif
#include <map>
#include <list>
#include <stdexcept>
#include <string>
#ifdef BOOST_HAS_THREADS
#ifdef BOOST_REGEX_CXX03
#include <boost/regex/pending/static_mutex.hpp>
#else
#include <mutex>
#endif
#include <boost/regex/v5/object_cache.hpp>
#endif
namespace boost{
template <class Key, class Object>
class object_cache
{
public:
typedef std::pair< BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const>, Key const*> value_type;
typedef std::list<value_type> list_type;
typedef typename list_type::iterator list_iterator;
typedef std::map<Key, list_iterator> map_type;
typedef typename map_type::iterator map_iterator;
typedef typename list_type::size_type size_type;
static BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const> get(const Key& k, size_type l_max_cache_size);
private:
static BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const> do_get(const Key& k, size_type l_max_cache_size);
struct data
{
list_type cont;
map_type index;
};
// Needed by compilers not implementing the resolution to DR45. For reference,
// see http://www.open-std.org/JTC1/SC22/WG21/docs/cwg_defects.html#45.
friend struct data;
};
#ifdef BOOST_MSVC
#pragma warning(push)
#pragma warning(disable: 4702)
#endif
template <class Key, class Object>
BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const> object_cache<Key, Object>::get(const Key& k, size_type l_max_cache_size)
{
#ifdef BOOST_HAS_THREADS
#ifdef BOOST_REGEX_CXX03
static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT;
boost::static_mutex::scoped_lock l(mut);
if (l)
{
return do_get(k, l_max_cache_size);
}
//
// what do we do if the lock fails?
// 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"));
#if defined(BOOST_NO_UNREACHABLE_RETURN_DETECTION) || defined(BOOST_NO_EXCEPTIONS)
return BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object>();
#endif
#else
static std::mutex mut;
std::lock_guard<std::mutex> l(mut);
return do_get(k, l_max_cache_size);
#endif
#else
return do_get(k, l_max_cache_size);
#endif
}
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
template <class Key, class Object>
BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k, size_type l_max_cache_size)
{
typedef typename object_cache<Key, Object>::data object_data;
typedef typename map_type::size_type map_size_type;
static object_data s_data;
//
// see if the object is already in the cache:
//
map_iterator mpos = s_data.index.find(k);
if(mpos != s_data.index.end())
{
//
// Eureka!
// We have a cached item, bump it up the list and return it:
//
if(--(s_data.cont.end()) != mpos->second)
{
// splice out the item we want to move:
list_type temp;
temp.splice(temp.end(), s_data.cont, mpos->second);
// and now place it at the end of the list:
s_data.cont.splice(s_data.cont.end(), temp, temp.begin());
BOOST_REGEX_ASSERT(*(s_data.cont.back().second) == k);
// update index with new position:
mpos->second = --(s_data.cont.end());
BOOST_REGEX_ASSERT(&(mpos->first) == mpos->second->second);
BOOST_REGEX_ASSERT(&(mpos->first) == s_data.cont.back().second);
}
return s_data.cont.back().first;
}
//
// if we get here then the item is not in the cache,
// so create it:
//
BOOST_REGEX_SHARED_PTR_NS::shared_ptr<Object const> result(new Object(k));
//
// Add it to the list, and index it:
//
s_data.cont.push_back(value_type(result, static_cast<Key const*>(0)));
s_data.index.insert(std::make_pair(k, --(s_data.cont.end())));
s_data.cont.back().second = &(s_data.index.find(k)->first);
map_size_type s = s_data.index.size();
BOOST_REGEX_ASSERT(s_data.index[k]->first.get() == result.get());
BOOST_REGEX_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);
BOOST_REGEX_ASSERT(s_data.index.find(k)->first == k);
if(s > l_max_cache_size)
{
//
// We have too many items in the list, so we need to start
// popping them off the back of the list, but only if they're
// being held uniquely by us:
//
list_iterator pos = s_data.cont.begin();
list_iterator last = s_data.cont.end();
while((pos != last) && (s > l_max_cache_size))
{
if(pos->first.unique())
{
list_iterator condemmed(pos);
++pos;
// now remove the items from our containers,
// then order has to be as follows:
BOOST_REGEX_ASSERT(s_data.index.find(*(condemmed->second)) != s_data.index.end());
s_data.index.erase(*(condemmed->second));
s_data.cont.erase(condemmed);
--s;
}
else
++pos;
}
BOOST_REGEX_ASSERT(s_data.index[k]->first.get() == result.get());
BOOST_REGEX_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);
BOOST_REGEX_ASSERT(s_data.index.find(k)->first == k);
}
return result;
}
#undef BOOST_REGEX_SHARED_PTR_NS
#endif

2
include/boost/regex/v5/regex_iterator.hpp
View File

@ -141,7 +141,7 @@ private:
void cow()
{
// copy-on-write
if(pdata.get() && !pdata.unique())
if(pdata.get() && (pdata.use_count() > 1))
{
pdata.reset(new impl(*(pdata.get())));
}

2
include/boost/regex/v5/regex_token_iterator.hpp
View File

@ -201,7 +201,7 @@ private:
void cow()
{
// copy-on-write
if(pdata.get() && !pdata.unique())
if(pdata.get() && (pdata.use_count() > 1))
{
pdata.reset(new impl(*(pdata.get())));
}

2
include/boost/regex/v5/u32regex_iterator.hpp
View File

@ -133,7 +133,7 @@ private:
void cow()
{
// copy-on-write
if(pdata.get() && !pdata.unique())
if(pdata.get() && (pdata.use_count() > 1))
{
pdata.reset(new impl(*(pdata.get())));
}

2
include/boost/regex/v5/u32regex_token_iterator.hpp
View File

@ -200,7 +200,7 @@ private:
void cow()
{
// copy-on-write
if(pdata.get() && !pdata.unique())
if(pdata.get() && (pdata.use_count() > 1))
{
pdata.reset(new impl(*(pdata.get())));
}