diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 8aeb1e18..132e806b 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -21,7 +21,7 @@ // #endif -#if (_MSC_VER <= 1300) // || !defined(BOOST_STRICT_CONFIG) // VC7 Beta 2 or later +#if (_MSC_VER <= 1300) #if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS) // VC7 bug with /Za # define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS @@ -51,7 +51,7 @@ #endif -#if _MSC_VER <= 1301 +#if _MSC_VER <= 1310 # define BOOST_NO_SWPRINTF #endif @@ -71,6 +71,9 @@ #if (_MSC_VER >= 1200) && defined(_MSC_EXTENSIONS) # define BOOST_HAS_MS_INT64 #endif +#if (_MSC_VER >= 1310) && defined(_MSC_EXTENSIONS) +# define BOOST_HAS_LONG_LONG +#endif // // disable Win32 API's if compiler extentions are // turned off: @@ -83,6 +86,8 @@ # define BOOST_COMPILER_VERSION 6.0 # elif _MSC_VER == 1300 # define BOOST_COMPILER_VERSION 7.0 +# elif _MSC_VER == 1310 +# define BOOST_COMPILER_VERSION 7.1 # else # define BOOST_COMPILER_VERSION _MSC_VER # endif @@ -108,3 +113,5 @@ + + diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp index c20f779b..0895e150 100644 --- a/include/boost/config/stdlib/dinkumware.hpp +++ b/include/boost/config/stdlib/dinkumware.hpp @@ -21,7 +21,7 @@ # if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) // can be defined in yvals.h # define BOOST_NO_STDC_NAMESPACE # endif -# if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) +# if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0) && !(defined(_MSC_VER) && (_MSC_VER > 1300))) # define BOOST_NO_STD_ALLOCATOR # endif # if defined(_MSC_VER) && (_MSC_VER < 1300) @@ -74,3 +74,4 @@ +