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

Subject: [Boost-commit] svn:boost r78236 - trunk/boost/property_map
From: jewillco_at_[hidden]
Date: 2012-04-28 03:35:14

Author: jewillco
Date: 2012-04-28 03:35:12 EDT (Sat, 28 Apr 2012)
New Revision: 78236
URL: http://svn.boost.org/trac/boost/changeset/78236

Log:
Trying to work around VC++ problem
Text files modified: 
   trunk/boost/property_map/dynamic_property_map.hpp |    13 +++++++++++--                           
   1 files changed, 11 insertions(+), 2 deletions(-)

Modified: trunk/boost/property_map/dynamic_property_map.hpp
==============================================================================
--- trunk/boost/property_map/dynamic_property_map.hpp	(original)
+++ trunk/boost/property_map/dynamic_property_map.hpp	2012-04-28 03:35:12 EDT (Sat, 28 Apr 2012)
@@ -117,6 +117,15 @@
 
 namespace detail {
 
+// Trying to work around VC++ problem that seems to relate to having too many
+// functions named "get"
+template <typename PMap, typename Key>
+typename boost::property_traits<PMap>::reference
+get_wrapper_xxx(const PMap& pmap, const Key& key) {
+  using boost::get;
+  return get(pmap, key);
+}
+
 //
 // dynamic_property_map_adaptor -
 //   property-map adaptor to support runtime polymorphism.
@@ -179,9 +188,9 @@
 #if defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95)
     return boost::get(property_map_, any_cast<key_type>(key));
 #else
-    using boost::get;
+    // using boost::get;
 
-    return get(property_map_, any_cast<key_type>(key));
+    return get_wrapper_xxx(property_map_, any_cast<key_type>(key));
 #endif
   }