From 84431c1e326ae706fbad4fe26fed08d4fa66883e Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Sun, 1 Sep 2002 14:57:40 +0000 Subject: [PATCH] Distinguish between VC++ versions [SVN r15127] --- tests/cv_traits_test.cpp | 2 +- tests/is_same_test.cpp | 2 +- tests/transform_traits_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cv_traits_test.cpp b/tests/cv_traits_test.cpp index 6b9e8ee..208533f 100644 --- a/tests/cv_traits_test.cpp +++ b/tests/cv_traits_test.cpp @@ -55,7 +55,7 @@ int cpp_main(int argc, char* argv[]) // // define the number of failures expected for given compilers: -#ifdef BOOST_MSVC +#if defined(BOOST_MSVC) && _MSC_VER <= 1300 unsigned int expected_failures = 2; #elif defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x530) unsigned int expected_failures = 1; diff --git a/tests/is_same_test.cpp b/tests/is_same_test.cpp index 0aa5989..37e85d7 100644 --- a/tests/is_same_test.cpp +++ b/tests/is_same_test.cpp @@ -38,7 +38,7 @@ int cpp_main(int argc, char* argv[]) // // define the number of failures expected for given compilers: -#ifdef BOOST_MSVC +#if defined(BOOST_MSVC) && _MSC_VER <= 1300 // can't separate void and cv-void: unsigned int expected_failures = 1; #elif defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x530) diff --git a/tests/transform_traits_test.cpp b/tests/transform_traits_test.cpp index a006c66..681393a 100644 --- a/tests/transform_traits_test.cpp +++ b/tests/transform_traits_test.cpp @@ -461,7 +461,7 @@ unsigned int expected_failures = 97; // cv-qualifiers # else unsigned int expected_failures = 474; // cv-qualifiers # endif -#elif defined(BOOST_MSVC) +#elif defined(BOOST_MSVC) && _MSC_VER <= 1300 unsigned int expected_failures = 84; // partial specialisation (fails for UDT's) #elif defined(__SUNPRO_CC) unsigned int expected_failures = 1; // cv-qualified references