[Boost-commit] svn:boost r57645 - trunk/boost/xpressive

Subject: [Boost-commit] svn:boost r57645 - trunk/boost/xpressive
From: eric_at_[hidden]
Date: 2009-11-14 03:24:35

Author: eric_niebler
Date: 2009-11-14 03:24:35 EST (Sat, 14 Nov 2009)
New Revision: 57645
URL: http://svn.boost.org/trac/boost/changeset/57645

Log:
use boost::optional's swap instead of std::swap
Text files modified: 
   trunk/boost/xpressive/match_results.hpp |     9 +++++----                               
   1 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/boost/xpressive/match_results.hpp
==============================================================================
--- trunk/boost/xpressive/match_results.hpp	(original)
+++ trunk/boost/xpressive/match_results.hpp	2009-11-14 03:24:35 EST (Sat, 14 Nov 2009)
@@ -653,11 +653,12 @@
     /// \throw nothrow
     void swap(match_results<BidiIter> &that) // throw()
     {
-        std::swap(this->regex_id_, that.regex_id_);
+        using std::swap;
+        swap(this->regex_id_, that.regex_id_);
         this->sub_matches_.swap(that.sub_matches_);
-        std::swap(this->base_, that.base_);
-        std::swap(this->prefix_, that.prefix_);
-        std::swap(this->suffix_, that.suffix_);
+        this->base_.swap(that.base_);
+        this->prefix_.swap(that.prefix_);
+        this->suffix_.swap(that.suffix_);
         this->nested_results_.swap(that.nested_results_);
         this->extras_ptr_.swap(that.extras_ptr_);
         this->traits_.swap(that.traits_);