boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-18 06:42:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed member functions "free" to prevent conflict with system macro.

Browse Source 
[SVN r11380]
This commit is contained in:
John Maddock
2001-10-13 10:19:01 +00:00
parent de9ad8df74
commit 33b6eb0637
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/regex.hpp
View File

@ -890,7 +890,7 @@ protected:
// protected contructor for derived class... // protected contructor for derived class...
match_results_base(bool){} match_results_base(bool){}
void BOOST_REGEX_CALL free(); void BOOST_REGEX_CALL m_free();
public: public:
@ -906,7 +906,7 @@ public:
~match_results_base() ~match_results_base()
{ {
free(); m_free();
} }
size_type BOOST_REGEX_CALL size()const size_type BOOST_REGEX_CALL size()const
@ -1096,7 +1096,7 @@ inline match_results_base<iterator, Allocator>& BOOST_REGEX_CALL match_results_b
{ {
if(ref != m.ref) if(ref != m.ref)
{ {
free(); m_free();
ref = m.ref; ref = m.ref;
++(ref->count); ++(ref->count);
} }
@ -1105,7 +1105,7 @@ inline match_results_base<iterator, Allocator>& BOOST_REGEX_CALL match_results_b
template <class iterator, class Allocator> template <class iterator, class Allocator>
void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::free() void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::m_free()
{ {
if(--(ref->count) == 0) if(--(ref->count) == 0)
{ {
@ -1162,7 +1162,7 @@ void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_typ
new (p1) sub_match<iterator>(); new (p1) sub_match<iterator>();
++p1; ++p1;
} }
free(); m_free();
} }
catch(...) catch(...)
{ {
@ -1204,7 +1204,7 @@ void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_typ
new (p1) sub_match<iterator>(j); new (p1) sub_match<iterator>(j);
++p1; ++p1;
} }
free(); m_free();
} }
catch(...) catch(...)
{ {

8
include/boost/regex/detail/regex_match.hpp
View File

@ -163,9 +163,9 @@ public:
~_priv_match_data() ~_priv_match_data()
{ {
free(); m_free();
} }
void free(); void m_free();
void set_accumulator_size(unsigned int size); void set_accumulator_size(unsigned int size);
int* get_accumulators() int* get_accumulators()
{ {
@ -191,7 +191,7 @@ void _priv_match_data<iterator, Allocator>::set_accumulator_size(unsigned int si
{ {
if(size > caccumulators) if(size > caccumulators)
{ {
free(); m_free();
caccumulators = size; caccumulators = size;
accumulators = i_alloc(temp_match.allocator()).allocate(caccumulators); accumulators = i_alloc(temp_match.allocator()).allocate(caccumulators);
loop_starts = it_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> template <class iterator, class Allocator>
void _priv_match_data<iterator, Allocator>::free() void _priv_match_data<iterator, Allocator>::m_free()
{ {
if(caccumulators) if(caccumulators)
{ {

8
include/boost/regex/regex_traits.hpp
View File

@ -239,7 +239,7 @@ public:
} }
~c_regex_traits() ~c_regex_traits()
{ {
free(); m_free();
} }
struct sentry struct sentry
{ {
@ -250,7 +250,7 @@ public:
static void BOOST_REGEX_CALL update(); static void BOOST_REGEX_CALL update();
private: private:
static void BOOST_REGEX_CALL init(); 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 c_regex_traits<char> i;
static unsigned sort_type; static unsigned sort_type;
@ -307,7 +307,7 @@ public:
c_regex_traits<wchar_t>() c_regex_traits<wchar_t>()
{ init(); } { init(); }
~c_regex_traits<wchar_t>() ~c_regex_traits<wchar_t>()
{ free(); } { m_free(); }
struct sentry struct sentry
{ {
sentry(const c_regex_traits<wchar_t>&) 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); static unsigned int BOOST_REGEX_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
private: private:
static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f); 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 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 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_; static c_regex_traits<wchar_t> init_;