diff --git a/include/boost/typeof/msvc/typeof_impl.hpp b/include/boost/typeof/msvc/typeof_impl.hpp index 3bc2ca7..3071efb 100644 --- a/include/boost/typeof/msvc/typeof_impl.hpp +++ b/include/boost/typeof/msvc/typeof_impl.hpp @@ -15,9 +15,7 @@ # include # include -# if BOOST_WORKAROUND(BOOST_MSVC,>=1310) -# include -# endif +# include namespace boost { @@ -25,7 +23,7 @@ namespace boost { //Compile time constant code -# if BOOST_WORKAROUND(BOOST_MSVC,>=1300) && defined(_MSC_EXTENSIONS) +# if defined(_MSC_EXTENSIONS) template struct the_counter; template @@ -85,26 +83,7 @@ namespace boost //Typeof code -# if BOOST_WORKAROUND(BOOST_MSVC,==1300) - template - struct msvc_extract_type - { - template - struct id2type_impl; - - typedef id2type_impl id2type; - }; - - template - struct msvc_register_type : msvc_extract_type - { - template<> - struct id2type_impl //VC7.0 specific bugfeature - { - typedef T type; - }; - }; -#elif BOOST_WORKAROUND(BOOST_MSVC,>=1400) +# if BOOST_WORKAROUND(BOOST_MSVC,>=1400) struct msvc_extract_type_default_param {}; template @@ -189,7 +168,6 @@ namespace boost { typedef char(*type)[encode_type::value]; }; -# if BOOST_WORKAROUND(BOOST_MSVC,>=1310) template typename disable_if< typename is_function::type, typename sizer::type>::type encode_start(T const&); @@ -197,10 +175,6 @@ namespace boost template typename enable_if< typename is_function::type, typename sizer::type>::type encode_start(T&); -# else - template - typename sizer::type encode_start(T const&); -# endif template msvc_register_type typeof_register_type(const T&,Organizer* =0); diff --git a/include/boost/typeof/register_fundamental.hpp b/include/boost/typeof/register_fundamental.hpp old mode 100755 new mode 100644 index 3a15888..a6164ba --- a/include/boost/typeof/register_fundamental.hpp +++ b/include/boost/typeof/register_fundamental.hpp @@ -34,8 +34,7 @@ BOOST_TYPEOF_REGISTER_TYPE(long double) BOOST_TYPEOF_REGISTER_TYPE(wchar_t) #endif -#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1200)) \ - || (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \ +#if (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \ || (defined(__BORLANDC__) && (__BORLANDC__ == 0x600) && (_MSC_VER == 1200)) BOOST_TYPEOF_REGISTER_TYPE(unsigned __int8) BOOST_TYPEOF_REGISTER_TYPE(__int8) diff --git a/include/boost/typeof/typeof.hpp b/include/boost/typeof/typeof.hpp index 4d56964..89abdb4 100644 --- a/include/boost/typeof/typeof.hpp +++ b/include/boost/typeof/typeof.hpp @@ -100,16 +100,6 @@ # define MSVC_TYPEOF_HACK # endif #elif defined(_MSC_VER) -# if (_MSC_VER <= 1300) // 6.5, 7.0 -# ifndef BOOST_TYPEOF_EMULATION -# ifndef BOOST_TYPEOF_NATIVE -# define BOOST_TYPEOF_NATIVE -# endif -# include -# define MSVC_TYPEOF_HACK -# else -# error typeof emulation is not supported -# endif # elif (_MSC_VER >= 1310) // 7.1 -> # ifndef BOOST_TYPEOF_EMULATION # ifndef BOOST_TYPEOF_NATIVE