[Boost-commit] svn:boost r47923 - trunk/boost/filesystem

From: bdawes_at_[hidden]
Date: 2008-07-31 20:00:58

Author: bemandawes
Date: 2008-07-31 20:00:58 EDT (Thu, 31 Jul 2008)
New Revision: 47923
URL: http://svn.boost.org/trac/boost/changeset/47923

Log:
Clear gcc shadow problems (Grant Erickson)
Text files modified: 
   trunk/boost/filesystem/path.hpp |    12 ++++++------                            
   1 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp	(original)
+++ trunk/boost/filesystem/path.hpp	2008-07-31 20:00:58 EDT (Thu, 31 Jul 2008)
@@ -594,23 +594,23 @@
       // BOOST_FILESYSTEM_DECL version works for VC++ but not GCC. Go figure!
       inline
       const char * what( const char * sys_err_what,
-        const path & path1, const path & path2, std::string & target )
+        const path & path1_arg, const path & path2_arg, std::string & target )
       {
         try
         {
           if ( target.empty() )
           {
             target = sys_err_what;
-            if ( !path1.empty() )
+            if ( !path1_arg.empty() )
             {
               target += ": \"";
-              target += path1.file_string();
+              target += path1_arg.file_string();
               target += "\"";
             }
-            if ( !path2.empty() )
+            if ( !path2_arg.empty() )
             {
               target += ", \"";
-              target += path2.file_string();
+              target += path2_arg.file_string();
               target += "\"";
             }
           }
@@ -624,7 +624,7 @@
 
       template<class Path>
       const char * what( const char * sys_err_what,
-        const Path & /*path1*/, const Path & /*path2*/, std::string & /*target*/ )
+        const Path & /*path1_arg*/, const Path & /*path2_arg*/, std::string & /*target*/ )
       {
         return sys_err_what;
       }