From 1672ca2d75dee47da3e81fcc0e5fa355e081580e Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Mon, 24 Mar 2003 02:13:22 +0000 Subject: [PATCH] merged from trunk [SVN r18070] --- include/boost/mpl/aux_/typeof.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/boost/mpl/aux_/typeof.hpp b/include/boost/mpl/aux_/typeof.hpp index a4a46e8..f69facc 100644 --- a/include/boost/mpl/aux_/typeof.hpp +++ b/include/boost/mpl/aux_/typeof.hpp @@ -16,12 +16,13 @@ #ifndef BOOST_MPL_AUX_TYPEOF_HPP_INCLUDED #define BOOST_MPL_AUX_TYPEOF_HPP_INCLUDED +#include #if defined(__BORLANDC__) # define BOOST_MPL_AUX_TYPEOF(T,x) typename T::value_type -#elif defined(__MWERKS__) || defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__EDG_VERSION__) && __EDG_VERSION__ <= 243 +#elif BOOST_WORKAROUND(__MWERKS__, <= 0x2407) || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(__EDG_VERSION__, <= 243) # define BOOST_MPL_AUX_TYPEOF(T,x) long -#elif defined(__GCC__) +#elif defined(__GCC__) && !BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) # define BOOST_MPL_AUX_TYPEOF(T,x) __typeof__(x) #else # include "boost/config.hpp"