Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r53414 - trunk/boost/parameter/aux_
From: daniel_at_[hidden]
Date: 2009-05-29 17:52:29


Author: danielw
Date: 2009-05-29 17:52:29 EDT (Fri, 29 May 2009)
New Revision: 53414
URL: http://svn.boost.org/trac/boost/changeset/53414

Log:
Silence annoying GCC -Wshadow warnings.
Fixes #3034.

Text files modified:
   trunk/boost/parameter/aux_/arg_list.hpp | 4 ++--
   trunk/boost/parameter/aux_/maybe.hpp | 16 ++++++++--------
   2 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/boost/parameter/aux_/arg_list.hpp
==============================================================================
--- trunk/boost/parameter/aux_/arg_list.hpp (original)
+++ trunk/boost/parameter/aux_/arg_list.hpp 2009-05-29 17:52:29 EDT (Fri, 29 May 2009)
@@ -212,9 +212,9 @@
     // Create a new list by prepending arg to a copy of tail. Used
     // when incrementally building this structure with the comma
     // operator.
- arg_list(TaggedArg arg, Next const& tail)
+ arg_list(TaggedArg head, Next const& tail)
       : Next(tail)
- , arg(arg)
+ , arg(head)
     {}
 
     // A metafunction class that, given a keyword and a default

Modified: trunk/boost/parameter/aux_/maybe.hpp
==============================================================================
--- trunk/boost/parameter/aux_/maybe.hpp (original)
+++ trunk/boost/parameter/aux_/maybe.hpp 2009-05-29 17:52:29 EDT (Fri, 29 May 2009)
@@ -33,8 +33,8 @@
         BOOST_DEDUCED_TYPENAME remove_reference<reference>::type
>::type non_cv_value;
         
- explicit maybe(T value)
- : value(value)
+ explicit maybe(T value_)
+ : value(value_)
       , constructed(false)
     {}
 
@@ -48,23 +48,23 @@
             this->destroy();
     }
 
- reference construct(reference value) const
+ reference construct(reference value_) const
     {
- return value;
+ return value_;
     }
 
     template <class U>
- reference construct2(U const& value) const
+ reference construct2(U const& value_) const
     {
- new (m_storage.bytes) non_cv_value(value);
+ new (m_storage.bytes) non_cv_value(value_);
         constructed = true;
         return *(non_cv_value*)m_storage.bytes;
     }
 
     template <class U>
- reference construct(U const& value) const
+ reference construct(U const& value_) const
     {
- return this->construct2(value);
+ return this->construct2(value_);
     }
 
     void destroy()


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