From 5ad06c7370337a7133823f80a63292decd3a1b75 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 24 Mar 2011 20:55:46 +0000
Subject: [PATCH] Logic: merge old warning fixes.

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


[SVN r70520]
---
 include/boost/logic/tribool.hpp    | 4 ++--
 include/boost/logic/tribool_io.hpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/boost/logic/tribool.hpp b/include/boost/logic/tribool.hpp
index 229feb4..90cba3e 100644
--- a/include/boost/logic/tribool.hpp
+++ b/include/boost/logic/tribool.hpp
@@ -93,7 +93,7 @@ public:
    *
    * \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 @@ namespace boost {
 #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; }
 
diff --git a/include/boost/logic/tribool_io.hpp b/include/boost/logic/tribool_io.hpp
index 3a05927..9ee34d4 100644
--- a/include/boost/logic/tribool_io.hpp
+++ b/include/boost/logic/tribool_io.hpp
@@ -140,7 +140,8 @@ public:
   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_; }