Subject: [Boost-commit] svn:boost r65135 - trunk/boost/typeof
From: peder.holt_at_[hidden]
Date: 2010-08-30 15:29:05
Author: burbelgruff
Date: 2010-08-30 15:29:02 EDT (Mon, 30 Aug 2010)
New Revision: 65135
URL: http://svn.boost.org/trac/boost/changeset/65135
Log:
#4593: Type_of does not use BOOST_TYPEOF_EMULATION for VC10 and \Za - fixed
Text files modified:
trunk/boost/typeof/typeof.hpp | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
Modified: trunk/boost/typeof/typeof.hpp
==============================================================================
--- trunk/boost/typeof/typeof.hpp (original)
+++ trunk/boost/typeof/typeof.hpp 2010-08-30 15:29:02 EDT (Mon, 30 Aug 2010)
@@ -110,24 +110,21 @@
# else
# error typeof emulation is not supported
# endif
-# elif (_MSC_VER >= 1310) // 7.1, 8.0
+# elif (_MSC_VER >= 1310) // 7.1 ->
# ifndef BOOST_TYPEOF_EMULATION
# ifndef BOOST_TYPEOF_NATIVE
-# define BOOST_TYPEOF_NATIVE
+# ifndef _MSC_EXTENSIONS
+# define BOOST_TYPEOF_EMULATION
+# else
+# define BOOST_TYPEOF_NATIVE
+# endif
# endif
-# include <boost/typeof/msvc/typeof_impl.hpp>
-# define MSVC_TYPEOF_HACK
# endif
-/*# else // 8.0
-# ifndef BOOST_TYPEOF_NATIVE
-# ifndef BOOST_TYPEOF_EMULATION
-# define BOOST_TYPEOF_EMULATION
-# endif
-# else
-# error native typeof is not supported
-# endif*/
-# endif
-
+# ifdef BOOST_TYPEOF_NATIVE
+# include <boost/typeof/msvc/typeof_impl.hpp>
+# define MSVC_TYPEOF_HACK
+# endif
+# endif
#elif defined(__HP_aCC)
# ifndef BOOST_TYPEOF_NATIVE
# ifndef BOOST_TYPEOF_EMULATION