Index: boost/regex/concepts.hpp =================================================================== --- boost/regex/concepts.hpp (revision 61350) +++ boost/regex/concepts.hpp (working copy) @@ -990,18 +990,18 @@ out = regex_format(out, m_cresults, func2b); out = regex_format(out, m_cresults, func1b, f); out = regex_format(out, m_cresults, func1b); - out = regex_format(out, m_cresults, ref(func3b), f); - out = regex_format(out, m_cresults, ref(func3b)); - out = regex_format(out, m_cresults, ref(func2b), f); - out = regex_format(out, m_cresults, ref(func2b)); - out = regex_format(out, m_cresults, ref(func1b), f); - out = regex_format(out, m_cresults, ref(func1b)); - out = regex_format(out, m_cresults, cref(func3b), f); - out = regex_format(out, m_cresults, cref(func3b)); - out = regex_format(out, m_cresults, cref(func2b), f); - out = regex_format(out, m_cresults, cref(func2b)); - out = regex_format(out, m_cresults, cref(func1b), f); - out = regex_format(out, m_cresults, cref(func1b)); + out = regex_format(out, m_cresults, boost::ref(func3b), f); + out = regex_format(out, m_cresults, boost::ref(func3b)); + out = regex_format(out, m_cresults, boost::ref(func2b), f); + out = regex_format(out, m_cresults, boost::ref(func2b)); + out = regex_format(out, m_cresults, boost::ref(func1b), f); + out = regex_format(out, m_cresults, boost::ref(func1b)); + out = regex_format(out, m_cresults, boost::cref(func3b), f); + out = regex_format(out, m_cresults, boost::cref(func3b)); + out = regex_format(out, m_cresults, boost::cref(func2b), f); + out = regex_format(out, m_cresults, boost::cref(func2b)); + out = regex_format(out, m_cresults, boost::cref(func1b), f); + out = regex_format(out, m_cresults, boost::cref(func1b)); m_string += regex_format(m_cresults, func3b, f); m_string += regex_format(m_cresults, func3b); @@ -1009,18 +1009,18 @@ m_string += regex_format(m_cresults, func2b); m_string += regex_format(m_cresults, func1b, f); m_string += regex_format(m_cresults, func1b); - m_string += regex_format(m_cresults, ref(func3b), f); - m_string += regex_format(m_cresults, ref(func3b)); - m_string += regex_format(m_cresults, ref(func2b), f); - m_string += regex_format(m_cresults, ref(func2b)); - m_string += regex_format(m_cresults, ref(func1b), f); - m_string += regex_format(m_cresults, ref(func1b)); - m_string += regex_format(m_cresults, cref(func3b), f); - m_string += regex_format(m_cresults, cref(func3b)); - m_string += regex_format(m_cresults, cref(func2b), f); - m_string += regex_format(m_cresults, cref(func2b)); - m_string += regex_format(m_cresults, cref(func1b), f); - m_string += regex_format(m_cresults, cref(func1b)); + m_string += regex_format(m_cresults, boost::ref(func3b), f); + m_string += regex_format(m_cresults, boost::ref(func3b)); + m_string += regex_format(m_cresults, boost::ref(func2b), f); + m_string += regex_format(m_cresults, boost::ref(func2b)); + m_string += regex_format(m_cresults, boost::ref(func1b), f); + m_string += regex_format(m_cresults, boost::ref(func1b)); + m_string += regex_format(m_cresults, boost::cref(func3b), f); + m_string += regex_format(m_cresults, boost::cref(func3b)); + m_string += regex_format(m_cresults, boost::cref(func2b), f); + m_string += regex_format(m_cresults, boost::cref(func2b)); + m_string += regex_format(m_cresults, boost::cref(func1b), f); + m_string += regex_format(m_cresults, boost::cref(func1b)); out = m_cresults.format(out, func3b, f); out = m_cresults.format(out, func3b); @@ -1028,18 +1028,18 @@ out = m_cresults.format(out, func2b); out = m_cresults.format(out, func1b, f); out = m_cresults.format(out, func1b); - out = m_cresults.format(out, ref(func3b), f); - out = m_cresults.format(out, ref(func3b)); - out = m_cresults.format(out, ref(func2b), f); - out = m_cresults.format(out, ref(func2b)); - out = m_cresults.format(out, ref(func1b), f); - out = m_cresults.format(out, ref(func1b)); - out = m_cresults.format(out, cref(func3b), f); - out = m_cresults.format(out, cref(func3b)); - out = m_cresults.format(out, cref(func2b), f); - out = m_cresults.format(out, cref(func2b)); - out = m_cresults.format(out, cref(func1b), f); - out = m_cresults.format(out, cref(func1b)); + out = m_cresults.format(out, boost::ref(func3b), f); + out = m_cresults.format(out, boost::ref(func3b)); + out = m_cresults.format(out, boost::ref(func2b), f); + out = m_cresults.format(out, boost::ref(func2b)); + out = m_cresults.format(out, boost::ref(func1b), f); + out = m_cresults.format(out, boost::ref(func1b)); + out = m_cresults.format(out, boost::cref(func3b), f); + out = m_cresults.format(out, boost::cref(func3b)); + out = m_cresults.format(out, boost::cref(func2b), f); + out = m_cresults.format(out, boost::cref(func2b)); + out = m_cresults.format(out, boost::cref(func1b), f); + out = m_cresults.format(out, boost::cref(func1b)); m_string += m_cresults.format(func3b, f); m_string += m_cresults.format(func3b); @@ -1047,18 +1047,18 @@ m_string += m_cresults.format(func2b); m_string += m_cresults.format(func1b, f); m_string += m_cresults.format(func1b); - m_string += m_cresults.format(ref(func3b), f); - m_string += m_cresults.format(ref(func3b)); - m_string += m_cresults.format(ref(func2b), f); - m_string += m_cresults.format(ref(func2b)); - m_string += m_cresults.format(ref(func1b), f); - m_string += m_cresults.format(ref(func1b)); - m_string += m_cresults.format(cref(func3b), f); - m_string += m_cresults.format(cref(func3b)); - m_string += m_cresults.format(cref(func2b), f); - m_string += m_cresults.format(cref(func2b)); - m_string += m_cresults.format(cref(func1b), f); - m_string += m_cresults.format(cref(func1b)); + m_string += m_cresults.format(boost::ref(func3b), f); + m_string += m_cresults.format(boost::ref(func3b)); + m_string += m_cresults.format(boost::ref(func2b), f); + m_string += m_cresults.format(boost::ref(func2b)); + m_string += m_cresults.format(boost::ref(func1b), f); + m_string += m_cresults.format(boost::ref(func1b)); + m_string += m_cresults.format(boost::cref(func3b), f); + m_string += m_cresults.format(boost::cref(func3b)); + m_string += m_cresults.format(boost::cref(func2b), f); + m_string += m_cresults.format(boost::cref(func2b)); + m_string += m_cresults.format(boost::cref(func1b), f); + m_string += m_cresults.format(boost::cref(func1b)); out = regex_replace(out, m_in, m_in, ce, func3, f); out = regex_replace(out, m_in, m_in, ce, func3); @@ -1066,18 +1066,18 @@ out = regex_replace(out, m_in, m_in, ce, func2); out = regex_replace(out, m_in, m_in, ce, func1, f); out = regex_replace(out, m_in, m_in, ce, func1); - out = regex_replace(out, m_in, m_in, ce, ref(func3), f); - out = regex_replace(out, m_in, m_in, ce, ref(func3)); - out = regex_replace(out, m_in, m_in, ce, ref(func2), f); - out = regex_replace(out, m_in, m_in, ce, ref(func2)); - out = regex_replace(out, m_in, m_in, ce, ref(func1), f); - out = regex_replace(out, m_in, m_in, ce, ref(func1)); - out = regex_replace(out, m_in, m_in, ce, cref(func3), f); - out = regex_replace(out, m_in, m_in, ce, cref(func3)); - out = regex_replace(out, m_in, m_in, ce, cref(func2), f); - out = regex_replace(out, m_in, m_in, ce, cref(func2)); - out = regex_replace(out, m_in, m_in, ce, cref(func1), f); - out = regex_replace(out, m_in, m_in, ce, cref(func1)); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func3), f); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func3)); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func2), f); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func2)); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func1), f); + out = regex_replace(out, m_in, m_in, ce, boost::ref(func1)); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func3), f); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func3)); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func2), f); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func2)); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func1), f); + out = regex_replace(out, m_in, m_in, ce, boost::cref(func1)); functor3 > func3s; functor2 > func2s; @@ -1088,18 +1088,18 @@ m_string += regex_replace(m_string, ce, func2s); m_string += regex_replace(m_string, ce, func1s, f); m_string += regex_replace(m_string, ce, func1s); - m_string += regex_replace(m_string, ce, ref(func3s), f); - m_string += regex_replace(m_string, ce, ref(func3s)); - m_string += regex_replace(m_string, ce, ref(func2s), f); - m_string += regex_replace(m_string, ce, ref(func2s)); - m_string += regex_replace(m_string, ce, ref(func1s), f); - m_string += regex_replace(m_string, ce, ref(func1s)); - m_string += regex_replace(m_string, ce, cref(func3s), f); - m_string += regex_replace(m_string, ce, cref(func3s)); - m_string += regex_replace(m_string, ce, cref(func2s), f); - m_string += regex_replace(m_string, ce, cref(func2s)); - m_string += regex_replace(m_string, ce, cref(func1s), f); - m_string += regex_replace(m_string, ce, cref(func1s)); + m_string += regex_replace(m_string, ce, boost::ref(func3s), f); + m_string += regex_replace(m_string, ce, boost::ref(func3s)); + m_string += regex_replace(m_string, ce, boost::ref(func2s), f); + m_string += regex_replace(m_string, ce, boost::ref(func2s)); + m_string += regex_replace(m_string, ce, boost::ref(func1s), f); + m_string += regex_replace(m_string, ce, boost::ref(func1s)); + m_string += regex_replace(m_string, ce, boost::cref(func3s), f); + m_string += regex_replace(m_string, ce, boost::cref(func3s)); + m_string += regex_replace(m_string, ce, boost::cref(func2s), f); + m_string += regex_replace(m_string, ce, boost::cref(func2s)); + m_string += regex_replace(m_string, ce, boost::cref(func1s), f); + m_string += regex_replace(m_string, ce, boost::cref(func1s)); } std::basic_ostream m_stream;