[Boost-commit] svn:boost r71718 - branches/release/boost/xpressive

Subject: [Boost-commit] svn:boost r71718 - branches/release/boost/xpressive
From: dgregor_at_[hidden]
Date: 2011-05-04 13:56:03

Author: dgregor
Date: 2011-05-04 13:56:03 EDT (Wed, 04 May 2011)
New Revision: 71718
URL: http://svn.boost.org/trac/boost/changeset/71718

Log:
Merge r71717 from trunk
Properties modified: 
   branches/release/boost/xpressive/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/match_results.hpp |     5 ++++-                                   
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/release/boost/xpressive/match_results.hpp
==============================================================================
--- branches/release/boost/xpressive/match_results.hpp	(original)
+++ branches/release/boost/xpressive/match_results.hpp	2011-05-04 13:56:03 EDT (Wed, 04 May 2011)
@@ -938,7 +938,10 @@
       , mpl::size_t<4>
     ) const
     {
-        return this->format2_(out, detail::ReplaceAlgo()(format, 0, *this));
+        // detail::ReplaceAlgo may be an incomplete type at this point, so
+        // we can't construct it directly.
+        typedef typename mpl::if_c<true, detail::ReplaceAlgo, OutputIterator>::type ReplaceAlgo;
+        return this->format2_(out, ReplaceAlgo()(format, 0, *this));
     }
 
     /// INTERNAL ONLY