feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests 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...
match_results_base(bool){}
void BOOST_REGEX_CALL free();
void BOOST_REGEX_CALL m_free();
public:
@ -906,7 +906,7 @@ public:
~match_results_base()
{
free();
m_free();
}
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)
{
free();
m_free();
ref = m.ref;
++(ref->count);
}
@ -1105,7 +1105,7 @@ inline match_results_base<iterator, Allocator>& BOOST_REGEX_CALL match_results_b
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)
{
@ -1162,7 +1162,7 @@ void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_typ
new (p1) sub_match<iterator>();
++p1;
}
free();
m_free();
}
catch(...)
{
@ -1204,7 +1204,7 @@ void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_typ
new (p1) sub_match<iterator>(j);
++p1;
}
free();
m_free();
}
catch(...)
{