[Boost-commit] svn:boost r50615 - in branches/release: . boost/proto/detail

Subject: [Boost-commit] svn:boost r50615 - in branches/release: . boost/proto/detail
From: eric_at_[hidden]
Date: 2009-01-15 17:53:41

Author: eric_niebler
Date: 2009-01-15 17:53:41 EST (Thu, 15 Jan 2009)
New Revision: 50615
URL: http://svn.boost.org/trac/boost/changeset/50615

Log:
Merged revisions 50603 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r50603 | eric_niebler | 2009-01-14 21:32:33 -0800 (Wed, 14 Jan 2009) | 1 line
  
  work-around for msvc overload resolution bug
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/proto/detail/decltype.hpp |     8 +++++++-                                
   1 files changed, 7 insertions(+), 1 deletions(-)

Modified: branches/release/boost/proto/detail/decltype.hpp
==============================================================================
--- branches/release/boost/proto/detail/decltype.hpp	(original)
+++ branches/release/boost/proto/detail/decltype.hpp	2009-01-15 17:53:41 EST (Thu, 15 Jan 2009)
@@ -11,6 +11,7 @@
 
 #include <boost/proto/detail/prefix.hpp> // must be first include
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 #include <boost/get_pointer.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
@@ -157,7 +158,12 @@
           : T
         {
             using T::operator[];
-            any operator[](any) const volatile;
+
+            #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
+            any operator[](any const volatile &) const volatile;
+            #else
+            any operator[](any const &) const volatile;
+            #endif
         };
 
         ////////////////////////////////////////////////////////////////////////////////////////////