[Boost-commit] svn:boost r81322 - in trunk/boost/test: impl tools

Subject: [Boost-commit] svn:boost r81322 - in trunk/boost/test: impl tools
From: gennadiy.rozental_at_[hidden]
Date: 2012-11-13 07:55:15

Author: rogeeff
Date: 2012-11-13 07:55:14 EST (Tue, 13 Nov 2012)
New Revision: 81322
URL: http://svn.boost.org/trac/boost/changeset/81322

Log:
avoid result_type
Fixes #6555 
Text files modified: 
   trunk/boost/test/impl/test_tools.ipp          |     8 ++++----                                
   trunk/boost/test/tools/output_test_stream.hpp |     9 ++++-----                               
   2 files changed, 8 insertions(+), 9 deletions(-)

Modified: trunk/boost/test/impl/test_tools.ipp
==============================================================================
--- trunk/boost/test/impl/test_tools.ipp	(original)
+++ trunk/boost/test/impl/test_tools.ipp	2012-11-13 07:55:14 EST (Tue, 13 Nov 2012)
@@ -494,7 +494,7 @@
 {
     sync();
 
-    result_type res( m_pimpl->m_synced_string.empty() );
+    predicate_result res( m_pimpl->m_synced_string.empty() );
 
     m_pimpl->check_and_fill( res );
 
@@ -511,7 +511,7 @@
 {
     sync();
 
-    result_type res( m_pimpl->m_synced_string.length() == length_ );
+    predicate_result res( m_pimpl->m_synced_string.length() == length_ );
 
     m_pimpl->check_and_fill( res );
 
@@ -528,7 +528,7 @@
 {
     sync();
 
-    result_type res( const_string( m_pimpl->m_synced_string ) == arg );
+    predicate_result res( const_string( m_pimpl->m_synced_string ) == arg );
 
     m_pimpl->check_and_fill( res );
 
@@ -545,7 +545,7 @@
 {
     sync();
 
-    result_type result( true );
+    predicate_result result( true );
 
     if( !m_pimpl->m_pattern.is_open() ) {
         result = false;

Modified: trunk/boost/test/tools/output_test_stream.hpp
==============================================================================
--- trunk/boost/test/tools/output_test_stream.hpp	(original)
+++ trunk/boost/test/tools/output_test_stream.hpp	2012-11-13 07:55:14 EST (Tue, 13 Nov 2012)
@@ -38,7 +38,6 @@
 
 class BOOST_TEST_DECL output_test_stream : public wrap_stringstream::wrapped_stream {
     typedef unit_test::const_string const_string;
-    typedef predicate_result        result_type;
 public:
     // Constructor
     explicit        output_test_stream( const_string    pattern_file_name = const_string(),
@@ -49,10 +48,10 @@
     ~output_test_stream();
 
     // checking function
-    result_type     is_empty( bool flush_stream = true );
-    result_type     check_length( std::size_t length, bool flush_stream = true );
-    result_type     is_equal( const_string arg_, bool flush_stream = true );
-    result_type     match_pattern( bool flush_stream = true );
+    predicate_result    is_empty( bool flush_stream = true );
+    predicate_result    check_length( std::size_t length, bool flush_stream = true );
+    predicate_result    is_equal( const_string arg_, bool flush_stream = true );
+    predicate_result    match_pattern( bool flush_stream = true );
 
     // explicit flush
     void            flush();