feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Fixed messed up c_regex_traits from previous commit, fixed Koenig lookup bug caused by presence of boost::re_detail::destroy

Browse Source 
[SVN r11249]
This commit is contained in:
John Maddock
2001-09-25 11:48:21 +00:00
parent 007c0da3b2
commit 4922ae784f
9 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/regex/detail/regex_format.hpp
View File

@ -104,8 +104,8 @@ void BOOST_REGEX_CALL re_skip_format(const charT*& fmt, const traits_type& trait
template <class T>
inline void oi_assign(T* p, T v)
{
::boost::re_detail::destroy(p);
construct(p, v);
::boost::re_detail::pointer_destroy(p);
pointer_construct(p, v);
}
#else

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

@ -215,7 +215,7 @@ void _priv_match_data<iterator, Allocator>::free()
i_alloc temp1(temp_match.allocator());
temp1.deallocate(accumulators, caccumulators);
for(unsigned i = 0; i < caccumulators; ++i)
::boost::re_detail::destroy(loop_starts + i);
::boost::re_detail::pointer_destroy(loop_starts + i);
it_alloc temp2(temp_match.allocator());
temp2.deallocate(loop_starts, caccumulators);
}

6
include/boost/regex/detail/regex_stack.hpp
View File

@ -119,7 +119,7 @@ public:
{
if(m_stack->start == m_stack->end)
pop_aux();
::boost::re_detail::destroy(m_stack->end);
::boost::re_detail::pointer_destroy(m_stack->end);
++(m_stack->end);
}
@ -128,7 +128,7 @@ public:
if(m_stack->start == m_stack->end)
pop_aux();
t = *m_stack->end;
::boost::re_detail::destroy(m_stack->end);
::boost::re_detail::pointer_destroy(m_stack->end);
++(m_stack->end);
}
@ -137,7 +137,7 @@ public:
if(m_stack->end == m_stack->last)
push_aux();
--(m_stack->end);
construct(m_stack->end, t);
pointer_construct(m_stack->end, t);
}
};