boost/boost.6397.warnings.patch

   1 --- misc/boost_1_44_0/boost/boost/crc.hpp
   2 +++ misc/build/boost_1_44_0/boost/boost/crc.hpp
   3 @@ -755,15 +755,15 @@ void
   4  crc_basic<Bits>::process_bits
   5  (
   6      unsigned char  bits,
   7 -    std::size_t    bit_count
   8 +    std::size_t    bit_count_
   9  )
  10  {
  11      // ignore the bits above the ones we want
  12 -    bits <<= CHAR_BIT - bit_count;
  13 +    bits <<= CHAR_BIT - bit_count_;
  14
  15      // compute the CRC for each bit, starting with the upper ones
  16      unsigned char const  high_bit_mask = 1u << ( CHAR_BIT - 1u );
  17 -    for ( std::size_t i = bit_count ; i > 0u ; --i, bits <<= 1u )
  18 +    for ( std::size_t i = bit_count_ ; i > 0u ; --i, bits <<= 1u )
  19      {
  20          process_bit( static_cast<bool>(bits & high_bit_mask) );
  21      }
  22 --- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp  2012-01-12 20:21:29.790009198 +0000
  23 +++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp    2012-01-12 20:28:55.457287835 +0000
  24 @@ -43,11 +43,11 @@
  25        i = c.end();
  26        c.swap(c);
  27      }
  28 -    void const_constraints(const Collection& c) {
  29 -      ci = c.begin();
  30 -      ci = c.end();
  31 -      n = c.size();
  32 -      b = c.empty();
  33 +    void const_constraints(const Collection& c_) {
  34 +      ci = c_.begin();
  35 +      ci = c_.end();
  36 +      n = c_.size();
  37 +      b = c_.empty();
  38      }
  39      Collection c;
  40      bool b;
  41 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp      2012-01-12 20:21:29.790009198 +0000
  42 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp        2012-01-12 20:29:56.482879277 +0000
  43 @@ -39,8 +39,8 @@
  44
  45      template <typename Array, typename IdxGen, typename Call_Type>
  46      static void call(Array& a, const IdxGen& idgen, Call_Type c) {
  47 -      typedef typename Array::index_range index_range;
  48 -      typedef typename Array::index index;
  49 +      typedef typename Array::index_range index_range_;
  50 +      typedef typename Array::index index_;
  51        idgen_helper<N-1>::call(a,idgen[c],c);
  52      }
  53    };
  54 @@ -50,8 +50,8 @@
  55
  56      template <typename Array, typename IdxGen, typename Call_Type>
  57      static void call(Array& a, const IdxGen& idgen, Call_Type) {
  58 -      typedef typename Array::index_range index_range;
  59 -      typedef typename Array::index index;
  60 +      typedef typename Array::index_range index_range_;
  61 +      typedef typename Array::index index_;
  62        a[ idgen ];
  63      }
  64    };
  65 @@ -153,27 +153,27 @@
  66        const_constraints(a);
  67      }
  68
  69 -    void const_constraints(const Array& a) {
  70 +    void const_constraints(const Array& a_) {
  71
  72        //      value_type vt = a[ id ];
  73
  74        // Test slicing, keeping only the first dimension, losing the rest
  75 -      idgen_helper<NumDims-1>::call(a,idgen[range],id);
  76 +      idgen_helper<NumDims-1>::call(a_,idgen[range],id);
  77
  78        // Test slicing, keeping all dimensions.
  79 -      idgen_helper<NumDims-1>::call(a,idgen[range],range);
  80 +      idgen_helper<NumDims-1>::call(a_,idgen[range],range);
  81
  82 -      st = a.size();
  83 -      st = a.num_dimensions();
  84 -      st = a.num_elements();
  85 -      stp = a.shape();
  86 -      idp = a.strides();
  87 -      idp = a.index_bases();
  88 -      cit = a.begin();
  89 -      cit = a.end();
  90 -      crit = a.rbegin();
  91 -      crit = a.rend();
  92 -      eltp = a.origin();
  93 +      st = a_.size();
  94 +      st = a_.num_dimensions();
  95 +      st = a_.num_elements();
  96 +      stp = a_.shape();
  97 +      idp = a_.strides();
  98 +      idp = a_.index_bases();
  99 +      cit = a_.begin();
 100 +      cit = a_.end();
 101 +      crit = a_.rbegin();
 102 +      crit = a_.rend();
 103 +      eltp = a_.origin();
 104      }
 105
 106      typedef typename Array::value_type value_type;
 107 --- misc/boost_1_44_0/boost/multi_array/extent_range.hpp        2012-01-12 20:21:29.790009198 +0000
 108 +++ misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp  2012-01-12 20:32:16.696241748 +0000
 109 @@ -26,11 +26,11 @@
 110    typedef Extent index;
 111    typedef SizeType size_type;
 112
 113 -  extent_range(index start, index finish) :
 114 -    super_type(start,finish) { }
 115 +  extent_range(index start_, index finish_) :
 116 +    super_type(start_,finish_) { }
 117
 118 -  extent_range(index finish) :
 119 -    super_type(0,finish) { }
 120 +  extent_range(index finish_) :
 121 +    super_type(0,finish_) { }
 122
 123    extent_range() : super_type(0,0) { }
 124
 125 --- misc/boost_1_44_0/boost/multi_array/index_range.hpp 2012-01-12 20:21:29.790009198 +0000
 126 +++ misc/build/boost_1_44_0/boost/multi_array/index_range.hpp   2012-01-12 20:31:29.405781105 +0000
 127 @@ -60,8 +60,8 @@
 128        degenerate_ = true;
 129      }
 130
 131 -    explicit index_range(index start, index finish, index stride=1)
 132 -      : start_(start), finish_(finish), stride_(stride),
 133 +    explicit index_range(index i_start, index i_finish, index i_stride=1)
 134 +      : start_(i_start), finish_(i_finish), stride_(i_stride),
 135          degenerate_(false)
 136      { }
 137
 138 @@ -107,11 +107,11 @@
 139
 140      index stride() const { return stride_; }
 141
 142 -    void set_index_range(index start, index finish, index stride=1)
 143 +    void set_index_range(index i_start, index i_finish, index i_stride=1)
 144      {
 145 -      start_ = start;
 146 -      finish_ = finish;
 147 -      stride_ = stride;
 148 +      start_ = i_start;
 149 +      finish_ = i_finish;
 150 +      stride_ = i_stride;
 151      }
 152
 153      static index_range all()
 154 --- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp     2012-01-12 20:21:29.790009198 +0000
 155 +++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp       2012-01-12 20:25:49.280492556 +0000
 156 @@ -86,24 +86,24 @@
 157        num_elements_(other.num_elements_)  {  }
 158
 159    template <typename ExtentList>
 160 -  explicit const_multi_array_ref(TPtr base, const ExtentList& extents) :
 161 +  explicit const_multi_array_ref(TPtr base, const ExtentList& extents_) :
 162      base_(base), storage_(c_storage_order()) {
 163      boost::function_requires<
 164        detail::multi_array::CollectionConcept<ExtentList> >();
 165
 166      index_base_list_.assign(0);
 167 -    init_multi_array_ref(extents.begin());
 168 +    init_multi_array_ref(extents_.begin());
 169    }
 170
 171    template <typename ExtentList>
 172 -  explicit const_multi_array_ref(TPtr base, const ExtentList& extents,
 173 +  explicit const_multi_array_ref(TPtr base, const ExtentList& extents_,
 174                         const general_storage_order<NumDims>& so) :
 175      base_(base), storage_(so) {
 176      boost::function_requires<
 177        detail::multi_array::CollectionConcept<ExtentList> >();
 178
 179      index_base_list_.assign(0);
 180 -    init_multi_array_ref(extents.begin());
 181 +    init_multi_array_ref(extents_.begin());
 182    }
 183
 184    explicit const_multi_array_ref(TPtr base,
 185 @@ -124,13 +124,13 @@
 186    }
 187
 188    template <class InputIterator>
 189 -  void assign(InputIterator begin, InputIterator end) {
 190 +  void assign(InputIterator begin_, InputIterator end_) {
 191      boost::function_requires<InputIteratorConcept<InputIterator> >();
 192
 193 -    InputIterator in_iter = begin;
 194 +    InputIterator in_iter = begin_;
 195      T* out_iter = base_;
 196      std::size_t copy_count=0;
 197 -    while (in_iter != end && copy_count < num_elements_) {
 198 +    while (in_iter != end_ && copy_count < num_elements_) {
 199        *out_iter++ = *in_iter++;
 200        copy_count++;
 201      }
 202 @@ -161,14 +161,14 @@
 203    }
 204
 205    template <typename SizeList>
 206 -  void reshape(const SizeList& extents) {
 207 +  void reshape(const SizeList& extents_) {
 208      boost::function_requires<
 209        detail::multi_array::CollectionConcept<SizeList> >();
 210      BOOST_ASSERT(num_elements_ ==
 211 -                 std::accumulate(extents.begin(),extents.end(),
 212 +                 std::accumulate(extents_.begin(),extents_.end(),
 213                                   size_type(1),std::multiplies<size_type>()));
 214
 215 -    std::copy(extents.begin(),extents.end(),extent_list_.begin());
 216 +    std::copy(extents_.begin(),extents_.end(),extent_list_.begin());
 217      this->compute_strides(stride_list_,extent_list_,storage_);
 218
 219      origin_offset_ =
 220 @@ -208,11 +208,11 @@
 221    }
 222
 223    template <typename IndexList>
 224 -  const element& operator()(IndexList indices) const {
 225 +  const element& operator()(IndexList indices_) const {
 226      boost::function_requires<
 227        detail::multi_array::CollectionConcept<IndexList> >();
 228      return super_type::access_element(boost::type<const element&>(),
 229 -                                      indices,origin(),
 230 +                                      indices_,origin(),
 231                                        shape(),strides(),index_bases());
 232    }
 233
 234 @@ -231,12 +231,12 @@
 235  #endif // BOOST_MSVC
 236    typename const_array_view<NDims>::type
 237    operator[](const detail::multi_array::
 238 -             index_gen<NumDims,NDims>& indices)
 239 +             index_gen<NumDims,NDims>& indices_)
 240      const {
 241      typedef typename const_array_view<NDims>::type return_type;
 242      return
 243        super_type::generate_array_view(boost::type<return_type>(),
 244 -                                      indices,
 245 +                                      indices_,
 246                                        shape(),
 247                                        strides(),
 248                                        index_bases(),
 249 @@ -327,20 +327,20 @@
 250    explicit
 251    const_multi_array_ref(TPtr base,
 252                          const storage_order_type& so,
 253 -                        const index * index_bases,
 254 +                        const index * index_bases_,
 255 -                        const size_type* extents) :
 256 +                        const size_type* extents_) :
 257      base_(base), storage_(so), origin_offset_(0), directional_offset_(0)
 258   {
 259 -   // If index_bases or extents is null, then initialize the corresponding
 260 +   // If index_bases_ or extents_ is null, then initialize the corresponding
 261     // private data to zeroed lists.
 262 -   if(index_bases) {
 263 +   if(index_bases_) {
 264       boost::detail::multi_array::
 265 -       copy_n(index_bases,NumDims,index_base_list_.begin());
 266 +       copy_n(index_bases_,NumDims,index_base_list_.begin());
 267     } else {
 268       std::fill_n(index_base_list_.begin(),NumDims,0);
 269     }
 270 -   if(extents) {
 271 -     init_multi_array_ref(extents);
 272 +   if(extents_) {
 273 +     init_multi_array_ref(extents_);
 274     } else {
 275       boost::array<index,NumDims> extent_list;
 276       extent_list.assign(0);
 277 @@ -374,12 +374,12 @@
 278                boost::mem_fun_ref(&extent_range::start));
 279
 280      // calculate the extents
 281 -    extent_list extents;
 282 +    extent_list extents_;
 283      std::transform(ranges.ranges_.begin(),ranges.ranges_.end(),
 284 -              extents.begin(),
 285 +              extents_.begin(),
 286                boost::mem_fun_ref(&extent_range::size));
 287
 288 -    init_multi_array_ref(extents.begin());
 289 +    init_multi_array_ref(extents_.begin());
 290    }
 291
 292
 293 @@ -445,16 +445,16 @@
 294    };
 295
 296    template <class ExtentList>
 297 -  explicit multi_array_ref(T* base, const ExtentList& extents) :
 298 -    super_type(base,extents) {
 299 +  explicit multi_array_ref(T* base, const ExtentList& extents_) :
 300 +    super_type(base,extents_) {
 301      boost::function_requires<
 302        detail::multi_array::CollectionConcept<ExtentList> >();
 303    }
 304
 305    template <class ExtentList>
 306 -  explicit multi_array_ref(T* base, const ExtentList& extents,
 307 +  explicit multi_array_ref(T* base, const ExtentList& extents_,
 308                             const general_storage_order<NumDims>& so) :
 309 -    super_type(base,extents,so) {
 310 +    super_type(base,extents_,so) {
 311      boost::function_requires<
 312        detail::multi_array::CollectionConcept<ExtentList> >();
 313    }
 314 @@ -509,11 +509,11 @@
 315    element* data() { return super_type::base_; }
 316
 317    template <class IndexList>
 318 -  element& operator()(const IndexList& indices) {
 319 +  element& operator()(const IndexList& indices_) {
 320      boost::function_requires<
 321        detail::multi_array::CollectionConcept<IndexList> >();
 322      return super_type::access_element(boost::type<element&>(),
 323 -                                      indices,origin(),
 324 +                                      indices_,origin(),
 325                                        this->shape(),this->strides(),
 326                                        this->index_bases());
 327    }
 328 @@ -535,11 +535,11 @@
 329  #endif // BOOST_MSVC
 330    typename array_view<NDims>::type
 331    operator[](const detail::multi_array::
 332 -             index_gen<NumDims,NDims>& indices) {
 333 +             index_gen<NumDims,NDims>& indices_) {
 334      typedef typename array_view<NDims>::type return_type;
 335      return
 336        super_type::generate_array_view(boost::type<return_type>(),
 337 -                                      indices,
 338 +                                      indices_,
 339                                        this->shape(),
 340                                        this->strides(),
 341                                        this->index_bases(),
 342 @@ -576,10 +576,10 @@
 343    const element* data() const { return super_type::data(); }
 344
 345    template <class IndexList>
 346 -  const element& operator()(const IndexList& indices) const {
 347 +  const element& operator()(const IndexList& indices_) const {
 348      boost::function_requires<
 349        detail::multi_array::CollectionConcept<IndexList> >();
 350 -    return super_type::operator()(indices);
 351 +    return super_type::operator()(indices_);
 352    }
 353
 354    const_reference operator[](index idx) const {
 355 @@ -597,9 +597,9 @@
 356  #endif // BOOST_MSVC
 357    typename const_array_view<NDims>::type
 358    operator[](const detail::multi_array::
 359 -             index_gen<NumDims,NDims>& indices)
 360 +             index_gen<NumDims,NDims>& indices_)
 361      const {
 362 -    return super_type::operator[](indices);
 363 +    return super_type::operator[](indices_);
 364    }
 365
 366    const_iterator begin() const {
 367 @@ -622,9 +622,9 @@
 368    // This is only supplied to support multi_array's default constructor
 369    explicit multi_array_ref(T* base,
 370                             const storage_order_type& so,
 371 -                           const index* index_bases,
 372 -                           const size_type* extents) :
 373 -    super_type(base,so,index_bases,extents) { }
 374 +                           const index* index_bases_,
 375 +                           const size_type* extents_) :
 376 +    super_type(base,so,index_bases_,extents_) { }
 377
 378  };
 379
 380 --- misc/boost_1_44_0/boost/multi_array/storage_order.hpp       2012-01-12 20:21:29.790009198 +0000
 381 +++ misc/build/boost_1_44_0/boost/multi_array/storage_order.hpp 2012-01-12 20:30:57.667472937 +0000
 382 @@ -34,10 +34,10 @@
 383    public:
 384      typedef detail::multi_array::size_type size_type;
 385      template <typename OrderingIter, typename AscendingIter>
 386 -    general_storage_order(OrderingIter ordering,
 387 -                          AscendingIter ascending) {
 388 -      boost::detail::multi_array::copy_n(ordering,NumDims,ordering_.begin());
 389 -      boost::detail::multi_array::copy_n(ascending,NumDims,ascending_.begin());
 390 +    general_storage_order(OrderingIter i_ordering,
 391 +                          AscendingIter i_ascending) {
 392 +      boost::detail::multi_array::copy_n(i_ordering,NumDims,ordering_.begin());
 393 +      boost::detail::multi_array::copy_n(i_ascending,NumDims,ascending_.begin());
 394      }
 395
 396      // RG - ideally these would not be necessary, but some compilers
 397 --- misc/boost_1_44_0/boost/multi_array/subarray.hpp    2012-01-12 20:21:29.790009198 +0000
 398 +++ misc/build/boost_1_44_0/boost/multi_array/subarray.hpp      2012-01-12 20:27:12.346292228 +0000
 399 @@ -181,9 +181,9 @@
 400
 401    const_sub_array (TPtr base,
 402                   const size_type* extents,
 403 -                 const index* strides,
 404 +                 const index* i_strides,
 405                   const index* index_base) :
 406 -    base_(base), extents_(extents), strides_(strides),
 407 +    base_(base), extents_(extents), strides_(i_strides),
 408      index_base_(index_base) {
 409    }
 410
 411 @@ -369,9 +369,9 @@
 412
 413    sub_array (T* base,
 414              const size_type* extents,
 415 -            const index* strides,
 416 +            const index* _strides,
 417              const index* index_base) :
 418 -    super_type(base,extents,strides,index_base) {
 419 +    super_type(base,extents,_strides,index_base) {
 420    }
 421
 422  };
 423 --- misc/boost_1_44_0/boost/multi_array/view.hpp        2012-01-12 20:21:29.790009198 +0000
 424 +++ misc/build/boost_1_44_0/boost/multi_array/view.hpp  2012-01-12 20:26:36.350945110 +0000
 425 @@ -231,7 +231,7 @@
 426    template <typename ExtentList, typename Index>
 427    explicit const_multi_array_view(TPtr base,
 428                             const ExtentList& extents,
 429 -                           const boost::array<Index,NumDims>& strides):
 430 +                           const boost::array<Index,NumDims>& strides_):
 431      base_(base), origin_offset_(0) {
 432
 433      index_base_list_.assign(0);
 434 @@ -240,7 +240,7 @@
 435      boost::detail::multi_array::
 436        copy_n(extents.begin(),NumDims,extent_list_.begin());
 437      boost::detail::multi_array::
 438 -      copy_n(strides.begin(),NumDims,stride_list_.begin());
 439 +      copy_n(strides_.begin(),NumDims,stride_list_.begin());
 440
 441      // Calculate the array size
 442      num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),
 443 @@ -441,8 +441,8 @@
 444    template <typename ExtentList, typename Index>
 445    explicit multi_array_view(T* base,
 446                              const ExtentList& extents,
 447 -                            const boost::array<Index,NumDims>& strides) :
 448 -    super_type(base,extents,strides) { }
 449 +                            const boost::array<Index,NumDims>& _strides) :
 450 +    super_type(base,extents,_strides) { }
 451
 452  };
 453
 454 --- misc/boost_1_44_0/boost/multi_array.hpp     2012-09-28 13:06:44.796521371 +0100
 455 +++ misc/build/boost_1_44_0/boost/multi_array.hpp       2012-09-28 13:07:25.119002500 +0100
 456 @@ -139,20 +139,20 @@
 457
 458    explicit multi_array() :
 459      super_type((T*)initial_base_,c_storage_order(),
 460 -               /*index_bases=*/0, /*extents=*/0) {
 461 +               /*index_bases=*/0, /*extents_=*/0) {
 462      allocate_space();
 463    }
 464
 465    template <class ExtentList>
 466    explicit multi_array(
 467 -      ExtentList const& extents
 468 +      ExtentList const& extents_
 469  #ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 470        , typename mpl::if_<
 471        detail::multi_array::is_multi_array_impl<ExtentList>,
 472        int&,int>::type* = 0
 473  #endif
 474        ) :
 475 -    super_type((T*)initial_base_,extents) {
 476 +    super_type((T*)initial_base_,extents_) {
 477      boost::function_requires<
 478        detail::multi_array::CollectionConcept<ExtentList> >();
 479      allocate_space();
 480 @@ -160,19 +160,19 @@
 481
 482
 483    template <class ExtentList>
 484 -  explicit multi_array(ExtentList const& extents,
 485 +  explicit multi_array(ExtentList const& extents_,
 486                         const general_storage_order<NumDims>& so) :
 487 -    super_type((T*)initial_base_,extents,so) {
 488 +    super_type((T*)initial_base_,extents_,so) {
 489      boost::function_requires<
 490        detail::multi_array::CollectionConcept<ExtentList> >();
 491      allocate_space();
 492    }
 493
 494    template <class ExtentList>
 495 -  explicit multi_array(ExtentList const& extents,
 496 +  explicit multi_array(ExtentList const& extents_,
 497                         const general_storage_order<NumDims>& so,
 498                         Allocator const& alloc) :
 499 -    super_type((T*)initial_base_,extents,so), allocator_(alloc) {
 500 +    super_type((T*)initial_base_,extents_,so), allocator_(alloc) {
 501      boost::function_requires<
 502        detail::multi_array::CollectionConcept<ExtentList> >();
 503      allocate_space();
 504 @@ -381,7 +381,7 @@
 505
 506
 507    template <typename ExtentList>
 508 -  multi_array& resize(const ExtentList& extents) {
 509 +  multi_array& resize(const ExtentList& extents_) {
 510      boost::function_requires<
 511        detail::multi_array::CollectionConcept<ExtentList> >();
 512
 513 @@ -390,7 +390,7 @@
 514
 515      for (int i=0; i != NumDims; ++i) {
 516        typedef typename gen_type::range range_type;
 517 -      ranges.ranges_[i] = range_type(0,extents[i]);
 518 +      ranges.ranges_[i] = range_type(0,extents_[i]);
 519      }
 520
 521      return this->resize(ranges);
 522 @@ -423,9 +423,9 @@
 523      // Build index_gen objects to create views with the same shape
 524
 525      // these need to be separate to handle non-zero index bases
 526 -    typedef detail::multi_array::index_gen<NumDims,NumDims> index_gen;
 527 -    index_gen old_idxes;
 528 -    index_gen new_idxes;
 529 +    typedef detail::multi_array::index_gen<NumDims,NumDims> lcl_index_gen;
 530 +    lcl_index_gen old_idxes;
 531 +    lcl_index_gen new_idxes;
 532
 533      std::transform(new_array.index_base_list_.begin(),
 534                     new_array.index_base_list_.end(),
 535 --- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
 536 +++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
 537 @@ -195,16 +195,16 @@
 538    }
 539  #endif
 540
 541 -  friend bool operator==(const mersenne_twister& x, const mersenne_twister& y)
 542 +  friend bool operator==(const mersenne_twister& x_, const mersenne_twister& y_)
 543    {
 544      for(int j = 0; j < state_size; ++j)
 545 -      if(x.compute(j) != y.compute(j))
 546 +      if(x_.compute(j) != y_.compute(j))
 547          return false;
 548      return true;
 549    }
 550
 551 -  friend bool operator!=(const mersenne_twister& x, const mersenne_twister& y)
 552 -  { return !(x == y); }
 553 +  friend bool operator!=(const mersenne_twister& x_, const mersenne_twister& y_)
 554 +  { return !(x_ == y_); }
 555  #else
 556    // Use a member function; Streamable concept not supported.
 557    bool operator==(const mersenne_twister& rhs) const
 558 --- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
 559 +++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
 560 @@ -59,7 +59,7 @@
 561          }
 562
 563          if (flags & std::ios_base::left) {
 564 -            for (std::streamsize i=uuid_width; i<width; i++) {
 565 +            for (std::streamsize s=uuid_width; s<width; ++s) {
 566                  os << fill;
 567              }
 568          }
 569 --- misc/boost_1_44_0/boost/uuid/name_generator.hpp
 570 +++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
 571 @@ -30,8 +30,8 @@
 572  public:
 573      typedef uuid result_type;
 574
 575 -    explicit name_generator(uuid const& namespace_uuid)
 576 -        : namespace_uuid(namespace_uuid)
 577 +    explicit name_generator(uuid const& namespace_uuid_)
 578 +        : namespace_uuid(namespace_uuid_)
 579      {}
 580
 581      uuid operator()(const char* name) {