Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r67742 - trunk/boost
From: marshall_at_[hidden]
Date: 2011-01-06 19:23:48


Author: marshall
Date: 2011-01-06 19:23:47 EST (Thu, 06 Jan 2011)
New Revision: 67742
URL: http://svn.boost.org/trac/boost/changeset/67742

Log:
Applied patch - refs #4918; will merge to release after tests cycle
Text files modified:
   trunk/boost/concept_check.hpp | 26 ++++++++++++++------------
   1 files changed, 14 insertions(+), 12 deletions(-)

Modified: trunk/boost/concept_check.hpp
==============================================================================
--- trunk/boost/concept_check.hpp (original)
+++ trunk/boost/concept_check.hpp 2011-01-06 19:23:47 EST (Thu, 06 Jan 2011)
@@ -139,20 +139,21 @@
   {
     BOOST_CONCEPT_USAGE(Assignable) {
 #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
- a = a; // require assignment operator
+ a = b; // require assignment operator
 #endif
- const_constraints(a);
+ const_constraints(b);
     }
    private:
- void const_constraints(const TT& b) {
+ void const_constraints(const TT& x) {
 #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
- a = b; // const required for argument to assignment
+ a = x; // const required for argument to assignment
 #else
- ignore_unused_variable_warning(b);
+ ignore_unused_variable_warning(x);
 #endif
     }
    private:
     TT a;
+ TT b;
   };
 
 
@@ -183,22 +184,23 @@
   BOOST_concept(SGIAssignable,(TT))
   {
     BOOST_CONCEPT_USAGE(SGIAssignable) {
- TT b(a);
+ TT c(a);
 #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
- a = a; // require assignment operator
+ a = b; // require assignment operator
 #endif
- const_constraints(a);
- ignore_unused_variable_warning(b);
+ const_constraints(b);
+ ignore_unused_variable_warning(c);
     }
    private:
- void const_constraints(const TT& b) {
- TT c(b);
+ void const_constraints(const TT& x) {
+ TT c(x);
 #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
- a = b; // const required for argument to assignment
+ a = x; // const required for argument to assignment
 #endif
       ignore_unused_variable_warning(c);
     }
     TT a;
+ TT b;
   };
 #if (defined _MSC_VER)
 # pragma warning( pop )


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk