Ticket #2305: unit_test.patch

boost/test/unit_test_suite_impl.hpp

@@ -228 +228 @@
 struct user_tc_method_invoker {
     typedef void (UserTestCase::*test_method )();
 
-    user_tc_method_invoker( shared_ptr<InstanceType> inst, test_method test_method )
-    : m_inst( inst ), m_test_method( test_method ) {}
+    user_tc_method_invoker( shared_ptr<InstanceType> inst, test_method test_method_ )
+    : m_inst( inst ), m_test_method( test_method_ ) {}
 
     void operator()() { ((*m_inst).*m_test_method)(); }
 

boost/test/utils/basic_cstring/basic_cstring.hpp

@@ -511 +511 @@
 
 template<typename CharT>
 inline typename basic_cstring<CharT>::size_type
-basic_cstring<CharT>::find( basic_cstring<CharT> substr ) const
+basic_cstring<CharT>::find( basic_cstring<CharT> substr_ ) const
 {
-    if( substr.is_empty() || substr.size() > size() )
+    if( substr_.is_empty() || substr_.size() > size() )
         return (size_type)npos;
 
     const_iterator it   = begin();
-    const_iterator last = end() - substr.size() + 1;
+    const_iterator last = end() - substr_.size() + 1;
 
     while( it != last ) {
-        if( traits_type::compare( it, substr.begin(), substr.size() ) == 0 )
+        if( traits_type::compare( it, substr_.begin(), substr_.size() ) == 0 )
             break;
 
         ++it;
@@ -533 +533 @@
 
 template<typename CharT>
 inline typename basic_cstring<CharT>::size_type
-basic_cstring<CharT>::rfind( basic_cstring<CharT> substr ) const
+basic_cstring<CharT>::rfind( basic_cstring<CharT> substr_ ) const
 {
-    if( substr.is_empty() || substr.size() > size() )
+    if( substr_.is_empty() || substr_.size() > size() )
         return (size_type)npos;
 
-    const_iterator it   = end() - substr.size();
+    const_iterator it   = end() - substr_.size();
     const_iterator last = begin()-1;
 
     while( it != last ) {
-        if( traits_type::compare( it, substr.begin(), substr.size() ) == 0 )
+        if( traits_type::compare( it, substr_.begin(), substr_.size() ) == 0 )
             break;
 
         --it;

boost/progress.hpp

@@ -77 +77 @@
 class progress_display : private noncopyable
 {
  public:
-  explicit progress_display( unsigned long expected_count,
+  explicit progress_display( unsigned long expected_count_,
                              std::ostream & os = std::cout,
                              const std::string & s1 = "\n", //leading strings
                              const std::string & s2 = "",
                              const std::string & s3 = "" )
    // os is hint; implementation may ignore, particularly in embedded systems
-   : m_os(os), m_s1(s1), m_s2(s2), m_s3(s3) { restart(expected_count); }
+   : m_os(os), m_s1(s1), m_s2(s2), m_s3(s3) { restart(expected_count_); }
 
-  void           restart( unsigned long expected_count )
+  void           restart( unsigned long expected_count_ )
   //  Effects: display appropriate scale
   //  Postconditions: count()==0, expected_count()==expected_count
   {
     _count = _next_tic_count = _tic = 0;
-    _expected_count = expected_count;
+    _expected_count = expected_count_;
 
     m_os << m_s1 << "0%   10   20   30   40   50   60   70   80   90   100%\n"
          << m_s2 << "|----|----|----|----|----|----|----|----|----|----|"