diff --git a/include/boost/type_traits/conversion_traits.hpp b/include/boost/type_traits/conversion_traits.hpp index d8c0198..825159b 100644 --- a/include/boost/type_traits/conversion_traits.hpp +++ b/include/boost/type_traits/conversion_traits.hpp @@ -38,7 +38,7 @@ namespace boost{ -#ifdef BOOST_MSVC +#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 // // MS specific version: diff --git a/include/boost/type_traits/same_traits.hpp b/include/boost/type_traits/same_traits.hpp index fc3c555..e05579c 100644 --- a/include/boost/type_traits/same_traits.hpp +++ b/include/boost/type_traits/same_traits.hpp @@ -52,7 +52,7 @@ const bool is_same::value; #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -#ifdef BOOST_MSVC +#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 // // the following VC6 specific implementation is *NOT* legal // C++, but has the advantage that it works for incomplete diff --git a/tests/transform_traits_test.cpp b/tests/transform_traits_test.cpp index 5a221dc..ba817e1 100644 --- a/tests/transform_traits_test.cpp +++ b/tests/transform_traits_test.cpp @@ -20,7 +20,7 @@ // template test code. To prevent "Internal Compiler Error" // type messages, we have to split these up into lots of // separate functions: -#if defined(BOOST_MSVC) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x550)) +#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || (defined(__BORLANDC__) && (__BORLANDC__ < 0x550)) #define SHORT_TRANSFORM_TEST #endif #include "boost/type_traits/type_traits_test.hpp"