[Boost-commit] svn:boost r70520 - branches/release/boost/logic

Subject: [Boost-commit] svn:boost r70520 - branches/release/boost/logic
From: dnljms_at_[hidden]
Date: 2011-03-24 16:55:47

Author: danieljames
Date: 2011-03-24 16:55:46 EDT (Thu, 24 Mar 2011)
New Revision: 70520
URL: http://svn.boost.org/trac/boost/changeset/70520

Log:
Logic: merge old warning fixes.

- [53429] Fix `gcc -Wshadow` warnings. Fixes #3093.
- [58007] Remove unused parameter. Fixes #3600.

Text files modified: 
   branches/release/boost/logic/tribool.hpp    |     4 ++--                                    
   branches/release/boost/logic/tribool_io.hpp |     3 ++-                                     
   2 files changed, 4 insertions(+), 3 deletions(-)

Modified: branches/release/boost/logic/tribool.hpp
==============================================================================
--- branches/release/boost/logic/tribool.hpp	(original)
+++ branches/release/boost/logic/tribool.hpp	2011-03-24 16:55:46 EDT (Thu, 24 Mar 2011)
@@ -93,7 +93,7 @@
    *
    * \throws nothrow
    */
-  tribool(bool value) : value(value? true_value : false_value) {}
+  tribool(bool initial_value) : value(initial_value? true_value : false_value) {}
 
   /**
    * Construct a new 3-state boolean value with an indeterminate value.
@@ -452,7 +452,7 @@
 #define BOOST_TRIBOOL_THIRD_STATE(Name)                                 \
 inline bool                                                             \
 Name(boost::logic::tribool x,                                           \
-     boost::logic::detail::indeterminate_t dummy =                      \
+     boost::logic::detail::indeterminate_t =                            \
        boost::logic::detail::indeterminate_t())                         \
 { return x.value == boost::logic::tribool::indeterminate_value; }
 

Modified: branches/release/boost/logic/tribool_io.hpp
==============================================================================
--- branches/release/boost/logic/tribool_io.hpp	(original)
+++ branches/release/boost/logic/tribool_io.hpp	2011-03-24 16:55:46 EDT (Thu, 24 Mar 2011)
@@ -140,7 +140,8 @@
   indeterminate_name() : name_(get_default_indeterminate_name<CharT>()) {}
 
   /// Construct the facet with the given name for the indeterminate value
-  explicit indeterminate_name(const string_type& name) : name_(name) {}
+  explicit indeterminate_name(const string_type& initial_name)
+  : name_(initial_name) {}
 
   /// Returns the name for the indeterminate value
   string_type name() const { return name_; }