[Boost-commit] svn:boost r48772 - in trunk/boost/test: . utils/basic_cstring

Subject: [Boost-commit] svn:boost r48772 - in trunk/boost/test: . utils/basic_cstring
From: gennadiy.rozental_at_[hidden]
Date: 2008-09-14 03:25:25

Author: rogeeff
Date: 2008-09-14 03:25:24 EDT (Sun, 14 Sep 2008)
New Revision: 48772
URL: http://svn.boost.org/trac/boost/changeset/48772

Log:
avoid "shadowing of class members and variables" warning
Text files modified: 
   trunk/boost/test/unit_test_suite_impl.hpp              |     6 +++---                                  
   trunk/boost/test/utils/basic_cstring/basic_cstring.hpp |    16 ++++++++--------                        
   2 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/test/unit_test_suite_impl.hpp
==============================================================================
--- trunk/boost/test/unit_test_suite_impl.hpp	(original)
+++ trunk/boost/test/unit_test_suite_impl.hpp	2008-09-14 03:25:24 EDT (Sun, 14 Sep 2008)
@@ -229,15 +229,15 @@
 
 template<typename InstanceType,typename UserTestCase>
 struct user_tc_method_invoker {
-    typedef void (UserTestCase::*test_method )();
+    typedef void (UserTestCase::*TestMethod )();
 
-    user_tc_method_invoker( shared_ptr<InstanceType> inst, test_method test_method )
+    user_tc_method_invoker( shared_ptr<InstanceType> inst, TestMethod test_method )
     : m_inst( inst ), m_test_method( test_method ) {}
 
     void operator()() { ((*m_inst).*m_test_method)(); }
 
     shared_ptr<InstanceType> m_inst;
-    test_method              m_test_method;
+    TestMethod               m_test_method;
 };
 
 } // namespace ut_detail

Modified: trunk/boost/test/utils/basic_cstring/basic_cstring.hpp
==============================================================================
--- trunk/boost/test/utils/basic_cstring/basic_cstring.hpp	(original)
+++ trunk/boost/test/utils/basic_cstring/basic_cstring.hpp	2008-09-14 03:25:24 EDT (Sun, 14 Sep 2008)
@@ -511,16 +511,16 @@
 
 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> str ) const
 {
-    if( substr.is_empty() || substr.size() > size() )
+    if( str.is_empty() || str.size() > size() )
         return (size_type)npos;
 
     const_iterator it   = begin();
-    const_iterator last = end() - substr.size() + 1;
+    const_iterator last = end() - str.size() + 1;
 
     while( it != last ) {
-        if( traits_type::compare( it, substr.begin(), substr.size() ) == 0 )
+        if( traits_type::compare( it, str.begin(), str.size() ) == 0 )
             break;
 
         ++it;
@@ -533,16 +533,16 @@
 
 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> str ) const
 {
-    if( substr.is_empty() || substr.size() > size() )
+    if( str.is_empty() || str.size() > size() )
         return (size_type)npos;
 
-    const_iterator it   = end() - substr.size();
+    const_iterator it   = end() - str.size();
     const_iterator last = begin()-1;
 
     while( it != last ) {
-        if( traits_type::compare( it, substr.begin(), substr.size() ) == 0 )
+        if( traits_type::compare( it, str.begin(), str.size() ) == 0 )
             break;
 
         --it;