mirror of
https://github.com/boostorg/regex.git
synced 2025-07-23 17:17:22 +02:00
Renamed member functions "free" to prevent conflict with system macro.
[SVN r11380]
This commit is contained in:
@ -163,9 +163,9 @@ public:
|
||||
|
||||
~_priv_match_data()
|
||||
{
|
||||
free();
|
||||
m_free();
|
||||
}
|
||||
void free();
|
||||
void m_free();
|
||||
void set_accumulator_size(unsigned int size);
|
||||
int* get_accumulators()
|
||||
{
|
||||
@ -191,7 +191,7 @@ void _priv_match_data<iterator, Allocator>::set_accumulator_size(unsigned int si
|
||||
{
|
||||
if(size > caccumulators)
|
||||
{
|
||||
free();
|
||||
m_free();
|
||||
caccumulators = size;
|
||||
accumulators = i_alloc(temp_match.allocator()).allocate(caccumulators);
|
||||
loop_starts = it_alloc(temp_match.allocator()).allocate(caccumulators);
|
||||
@ -201,7 +201,7 @@ void _priv_match_data<iterator, Allocator>::set_accumulator_size(unsigned int si
|
||||
}
|
||||
|
||||
template <class iterator, class Allocator>
|
||||
void _priv_match_data<iterator, Allocator>::free()
|
||||
void _priv_match_data<iterator, Allocator>::m_free()
|
||||
{
|
||||
if(caccumulators)
|
||||
{
|
||||
|
@ -239,7 +239,7 @@ public:
|
||||
}
|
||||
~c_regex_traits()
|
||||
{
|
||||
free();
|
||||
m_free();
|
||||
}
|
||||
struct sentry
|
||||
{
|
||||
@ -250,7 +250,7 @@ public:
|
||||
static void BOOST_REGEX_CALL update();
|
||||
private:
|
||||
static void BOOST_REGEX_CALL init();
|
||||
static void BOOST_REGEX_CALL free();
|
||||
static void BOOST_REGEX_CALL m_free();
|
||||
static c_regex_traits<char> i;
|
||||
|
||||
static unsigned sort_type;
|
||||
@ -307,7 +307,7 @@ public:
|
||||
c_regex_traits<wchar_t>()
|
||||
{ init(); }
|
||||
~c_regex_traits<wchar_t>()
|
||||
{ free(); }
|
||||
{ m_free(); }
|
||||
struct sentry
|
||||
{
|
||||
sentry(const c_regex_traits<wchar_t>&)
|
||||
@ -319,7 +319,7 @@ public:
|
||||
static unsigned int BOOST_REGEX_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
|
||||
private:
|
||||
static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
|
||||
static void BOOST_REGEX_CALL free();
|
||||
static void BOOST_REGEX_CALL m_free();
|
||||
static void BOOST_REGEX_CALL init();
|
||||
static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
|
||||
static c_regex_traits<wchar_t> init_;
|
||||
|
Reference in New Issue
Block a user