From c07611151dfefcab899fa55762147d21164406ed Mon Sep 17 00:00:00 2001 From: Gennadiy Rozental Date: Mon, 22 Dec 2008 07:49:22 +0000 Subject: [PATCH] could->can [SVN r50350] --- include/boost/test/detail/enable_warnings.hpp | 4 ++-- include/boost/test/detail/suppress_warnings.hpp | 4 ++-- include/boost/test/impl/debug.ipp | 4 ++-- include/boost/test/impl/interaction_based.ipp | 3 +-- include/boost/test/impl/logged_expectations.ipp | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/boost/test/detail/enable_warnings.hpp b/include/boost/test/detail/enable_warnings.hpp index 94bc6c80..4cd71501 100644 --- a/include/boost/test/detail/enable_warnings.hpp +++ b/include/boost/test/detail/enable_warnings.hpp @@ -13,8 +13,8 @@ // *************************************************************************** #ifdef BOOST_MSVC -# pragma warning(default: 4511) // copy constructor could not be generated -# pragma warning(default: 4512) // assignment operator could not be generated +# pragma warning(default: 4511) // copy constructor can't not be generated +# pragma warning(default: 4512) // assignment operator can't not be generated # pragma warning(default: 4100) // unreferenced formal parameter # pragma warning(default: 4996) // was declared deprecated # pragma warning(default: 4355) // 'this' : used in base member initializer list diff --git a/include/boost/test/detail/suppress_warnings.hpp b/include/boost/test/detail/suppress_warnings.hpp index 02db5165..94060d0a 100644 --- a/include/boost/test/detail/suppress_warnings.hpp +++ b/include/boost/test/detail/suppress_warnings.hpp @@ -14,8 +14,8 @@ #ifdef BOOST_MSVC # pragma warning(push) -# pragma warning(disable: 4511) // copy constructor could not be generated -# pragma warning(disable: 4512) // assignment operator could not be generated +# pragma warning(disable: 4511) // copy constructor can't not be generated +# pragma warning(disable: 4512) // assignment operator can't not be generated # pragma warning(disable: 4100) // unreferenced formal parameter # pragma warning(disable: 4996) // was declared deprecated # pragma warning(disable: 4355) // 'this' : used in base member initializer list diff --git a/include/boost/test/impl/debug.ipp b/include/boost/test/impl/debug.ipp index fcca3265..19960518 100644 --- a/include/boost/test/impl/debug.ipp +++ b/include/boost/test/impl/debug.ipp @@ -834,8 +834,8 @@ attach_debugger( bool break_or_continue ) bool created = !!::CreateProcessA( NULL, // pointer to name of executable module; NULL - use the one in command line cmd_line, // pointer to command line string - NULL, // pointer to process security attributes; NULL - debugger's handle couldn't be inherited - NULL, // pointer to thread security attributes; NULL - debugger's handle couldn't be inherited + NULL, // pointer to process security attributes; NULL - debugger's handle can't be inherited + NULL, // pointer to thread security attributes; NULL - debugger's handle can't be inherited true, // debugger inherit opened handles 0, // priority flags; 0 - normal priority NULL, // pointer to new environment block; NULL - use this process environment diff --git a/include/boost/test/impl/interaction_based.ipp b/include/boost/test/impl/interaction_based.ipp index 8df4ae86..ce289336 100644 --- a/include/boost/test/impl/interaction_based.ipp +++ b/include/boost/test/impl/interaction_based.ipp @@ -66,8 +66,7 @@ manager::instance_ptr( bool reset, manager* new_ptr ) if( reset ) { if( new_ptr ) { - if( ptr != &dummy ) - throw unit_test::framework::setup_error( BOOST_TEST_L( "Couldn't run two interation based test the same time" ) ); + BOOST_TEST_SETUP_ASSERT( ptr == &dummy, BOOST_TEST_L( "Can't run two interation based test the same time" ) ); ptr = new_ptr; } diff --git a/include/boost/test/impl/logged_expectations.ipp b/include/boost/test/impl/logged_expectations.ipp index be8a52f6..ff30628b 100644 --- a/include/boost/test/impl/logged_expectations.ipp +++ b/include/boost/test/impl/logged_expectations.ipp @@ -85,7 +85,7 @@ expectations_logger::expectations_logger( const_string log_file_name, bool test_ m_log_file.open( log_file_name.begin(), test_or_log ? std::ios::in : std::ios::out ); BOOST_REQUIRE_MESSAGE( m_log_file.is_open(), - "Couldn't open expectations log file " << log_file_name + "Can't open expectations log file " << log_file_name << " for " << ( m_test_or_log ? "reading" : "writing") ); if( m_test_or_log ) {