[Boost-commit] svn:boost r47170 - trunk/boost/test/impl

From: gennadiy.rozental_at_[hidden]
Date: 2008-07-07 02:33:35

Author: rogeeff
Date: 2008-07-07 02:33:34 EDT (Mon, 07 Jul 2008)
New Revision: 47170
URL: http://svn.boost.org/trac/boost/changeset/47170

Log:
correct condition
Text files modified: 
   trunk/boost/test/impl/unit_test_main.ipp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/test/impl/unit_test_main.ipp
==============================================================================
--- trunk/boost/test/impl/unit_test_main.ipp	(original)
+++ trunk/boost/test/impl/unit_test_main.ipp	2008-07-07 02:33:34 EDT (Mon, 07 Jul 2008)
@@ -23,7 +23,7 @@
 
 #include <boost/test/detail/unit_test_parameters.hpp>
 
-#if !defined(__BORLANDC__) && BOOST_WORKAROUND( BOOST_MSVC, >= 1300 )
+#if !defined(__BORLANDC__) && !BOOST_WORKAROUND( BOOST_MSVC, < 1300 )
 #include <boost/test/utils/iterator/token_iterator.hpp>
 #endif
 
@@ -100,7 +100,9 @@
         const_string    m_value;
     };
     // Constructor
-#if !defined(__BORLANDC__) && BOOST_WORKAROUND( BOOST_MSVC, >= 1300 )
+#if defined(__BORLANDC__) || BOOST_WORKAROUND( BOOST_MSVC, < 1300 )
+    explicit        test_case_filter( const_string ) : m_depth( 0 ) {}
+#else
     explicit        test_case_filter( const_string tc_to_tun ) 
     : m_depth( 0 )
     {
@@ -114,8 +116,6 @@
             ++tit;           
         }
     }
-#else
-    explicit        test_case_filter( const_string ) : m_depth( 0 ) {}
 #endif
     
     void            filter_unit( test_unit const& tu )