diff -ru boost_1_34_0/boost/regex/v4/basic_regex.hpp boost_1_34_0_ibm/boost/regex/v4/basic_regex.hpp
old
|
new
|
|
254 | 254 | { |
255 | 255 | return do_assign(p1, p2, f); |
256 | 256 | } |
257 | | #if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) |
| 257 | #if !defined(BOOST_NO_MEMBER_TEMPLATES) |
258 | 258 | |
259 | 259 | template <class ST, class SA> |
260 | 260 | unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal) |
… |
… |
|
590 | 590 | return this->assign(that); |
591 | 591 | } |
592 | 592 | |
593 | | #if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) |
| 593 | #if !defined(BOOST_NO_MEMBER_TEMPLATES) |
594 | 594 | template <class ST, class SA> |
595 | 595 | explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal) |
596 | 596 | : basic_regex<charT, traits>(p, f) |