[Boost-commit] svn:boost r53429 - trunk/boost/logic

Subject: [Boost-commit] svn:boost r53429 - trunk/boost/logic
From: ghost_at_[hidden]
Date: 2009-05-30 02:36:19

Author: vladimir_prus
Date: 2009-05-30 02:36:18 EDT (Sat, 30 May 2009)
New Revision: 53429
URL: http://svn.boost.org/trac/boost/changeset/53429

Log:
Fix gcc -Wshadow warnings in tribool.

Fixes #3093. 1/2 of the patch provided by Dustin Spicuzza.

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

Modified: trunk/boost/logic/tribool.hpp
==============================================================================
--- trunk/boost/logic/tribool.hpp	(original)
+++ trunk/boost/logic/tribool.hpp	2009-05-30 02:36:18 EDT (Sat, 30 May 2009)
@@ -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.

Modified: trunk/boost/logic/tribool_io.hpp
==============================================================================
--- trunk/boost/logic/tribool_io.hpp	(original)
+++ trunk/boost/logic/tribool_io.hpp	2009-05-30 02:36:18 EDT (Sat, 30 May 2009)
@@ -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_; }