[Boost-commit] svn:boost r86681 - trunk/boost/property_map

Subject: [Boost-commit] svn:boost r86681 - trunk/boost/property_map
From: jewillco_at_[hidden]
Date: 2013-11-13 12:36:15

Author: jewillco
Date: 2013-11-13 12:36:15 EST (Wed, 13 Nov 2013)
New Revision: 86681
URL: http://svn.boost.org/trac/boost/changeset/86681

Log:
Changed some names to fix shadowing warnings; refs #9376

Text files modified: 
   trunk/boost/property_map/dynamic_property_map.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/property_map/dynamic_property_map.hpp
==============================================================================
--- trunk/boost/property_map/dynamic_property_map.hpp	Wed Nov 13 12:36:02 2013	(r86680)
+++ trunk/boost/property_map/dynamic_property_map.hpp	2013-11-13 12:36:15 EST (Wed, 13 Nov 2013)	(r86681)
@@ -146,16 +146,16 @@
   {
     using boost::put;
 
-    key_type key = any_cast<key_type>(in_key);
+    key_type key_ = any_cast<key_type>(in_key);
     if (in_value.type() == typeid(value_type)) {
-      put(property_map_, key, any_cast<value_type>(in_value));
+      put(property_map_, key_, any_cast<value_type>(in_value));
     } else {
       //  if in_value is an empty string, put a default constructed value_type.
       std::string v = any_cast<std::string>(in_value);
       if (v.empty()) {
-        put(property_map_, key, value_type());
+        put(property_map_, key_, value_type());
       } else {
-        put(property_map_, key, detail::read_value<value_type>(v));
+        put(property_map_, key_, detail::read_value<value_type>(v));
       }
     }
   }
@@ -169,15 +169,15 @@
   explicit dynamic_property_map_adaptor(const PropertyMap& property_map_)
     : property_map_(property_map_) { }
 
-  virtual boost::any get(const any& key)
+  virtual boost::any get(const any& key_)
   {
-    return get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key));
+    return get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key_));
   }
 
-  virtual std::string get_string(const any& key)
+  virtual std::string get_string(const any& key_)
   {
     std::ostringstream out;
-    out << get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key));
+    out << get_wrapper_xxx(property_map_, any_cast<typename boost::property_traits<PropertyMap>::key_type>(key_));
     return out.str();
   }