code.vuplus.com Git - vuplus_xbmc/blob - tools/depends/target/boost/fix-self-assignment-warnings.patch

   1 --- a/boost/concept_check.hpp
   2 +++ b/boost/concept_check.hpp
   3 @@ -136,20 +136,21 @@ namespace boost
   4    {
   5      BOOST_CONCEPT_USAGE(Assignable) {
   6  #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
   7 -      a = a;             // require assignment operator
   8 +      a = b;             // require assignment operator
   9  #endif
  10 -      const_constraints(a);
  11 +      const_constraints(b);
  12      }
  13     private:
  14 -    void const_constraints(const TT& b) {
  15 +    void const_constraints(const TT& x) {
  16  #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
  17 -      a = b;              // const required for argument to assignment
  18 +      a = x;              // const required for argument to assignment
  19  #else
  20 -      ignore_unused_variable_warning(b);
  21 +      ignore_unused_variable_warning(x);
  22  #endif
  23      }
  24     private:
  25      TT a;
  26 +    TT b;
  27    };
  28
  29
  30 @@ -180,22 +181,23 @@ namespace boost
  31    BOOST_concept(SGIAssignable,(TT))
  32    {
  33      BOOST_CONCEPT_USAGE(SGIAssignable) {
  34 -      TT b(a);
  35 +      TT c(a);
  36  #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
  37 -      a = a;              // require assignment operator
  38 +      a = b;              // require assignment operator
  39  #endif
  40 -      const_constraints(a);
  41 -      ignore_unused_variable_warning(b);
  42 +      const_constraints(b);
  43 +      ignore_unused_variable_warning(c);
  44      }
  45     private:
  46 -    void const_constraints(const TT& b) {
  47 -      TT c(b);
  48 +    void const_constraints(const TT& x) {
  49 +      TT c(x);
  50  #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
  51 -      a = b;              // const required for argument to assignment
  52 +      a = x;              // const required for argument to assignment
  53  #endif
  54        ignore_unused_variable_warning(c);
  55      }
  56      TT a;
  57 +    TT b;
  58    };
  59  #if (defined _MSC_VER)
  60  # pragma warning( pop )
  61