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

Fixes wrong type for mutex in regex v5

Browse Source 
With the Boost.Regex to ehader-only library, the declaration
of a mutex that should have been changed from boost::static_mutex
to std::mutex was left behind. This was preventing regex from
being built for older arm platforms [1]

[1]: https://github.com/openwrt/packages/issues/15725

Signed-off-by: Carlos Miguel Ferreira <carlosmf.pt@gmail.com>
This commit is contained in:
Carlos Miguel Ferreira
2021-06-03 23:10:37 +01:00
parent 7da62c1edb
commit 6064875bff
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/regex/v5/mem_block_cache.hpp
View File

@ -85,10 +85,10 @@ struct mem_block_node
struct mem_block_cache struct mem_block_cache
{ {
// this member has to be statically initialsed: // this member has to be statically initialsed:
mem_block_node* next; mem_block_node* next { nullptr };
unsigned cached_blocks; unsigned cached_blocks { 0 };
#ifdef BOOST_HAS_THREADS #ifdef BOOST_HAS_THREADS
boost::static_mutex mut; std::mutex mut;
#endif #endif
~mem_block_cache() ~mem_block_cache()
@ -133,11 +133,7 @@ struct mem_block_cache
} }
static mem_block_cache& instance() static mem_block_cache& instance()
{ {
#ifdef BOOST_HAS_THREADS static mem_block_cache block_cache;
static mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, };
#else
static mem_block_cache block_cache = { 0, 0, };
#endif
return block_cache; return block_cache;
} }
}; };