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

From: bdawes_at_[hidden]
Date: 2008-06-25 10:43:31

Author: bemandawes
Date: 2008-06-25 10:43:31 EDT (Wed, 25 Jun 2008)
New Revision: 46680
URL: http://svn.boost.org/trac/boost/changeset/46680

Log:
Clear gcc shadow warnings (Gordon Magnusson), fixing ticket #1770
Text files modified: 
   trunk/boost/filesystem/path.hpp |    30 +++++++++++++++---------------          
   1 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/boost/filesystem/path.hpp
==============================================================================
--- trunk/boost/filesystem/path.hpp	(original)
+++ trunk/boost/filesystem/path.hpp	2008-06-25 10:43:31 EDT (Wed, 25 Jun 2008)
@@ -624,14 +624,14 @@
 
       typedef Path path_type;
 
-      basic_filesystem_error( const std::string & what,
+      basic_filesystem_error( const std::string & what_arg,
         system::error_code ec );
 
-      basic_filesystem_error( const std::string & what,
-        const path_type & path1, system::error_code ec );
+      basic_filesystem_error( const std::string & what_arg,
+        const path_type & path1_arg, system::error_code ec );
 
-      basic_filesystem_error( const std::string & what, const path_type & path1,
-        const path_type & path2, system::error_code ec );
+      basic_filesystem_error( const std::string & what_arg, const path_type & path1_arg,
+        const path_type & path2_arg, system::error_code ec );
 
       ~basic_filesystem_error() throw() {}
 
@@ -1385,8 +1385,8 @@
 
     template<class Path>
     basic_filesystem_error<Path>::basic_filesystem_error(
-      const std::string & what, system::error_code ec )
-      : system::system_error(ec, what)
+      const std::string & what_arg, system::error_code ec )
+      : system::system_error(ec, what_arg)
     {
       try
       {
@@ -1397,29 +1397,29 @@
 
     template<class Path>
     basic_filesystem_error<Path>::basic_filesystem_error(
-      const std::string & what, const path_type & path1,
+      const std::string & what_arg, const path_type & path1_arg,
       system::error_code ec )
-      : system::system_error(ec, what)
+      : system::system_error(ec, what_arg)
     {
       try
       {
         m_imp_ptr.reset( new m_imp );
-        m_imp_ptr->m_path1 = path1;
+        m_imp_ptr->m_path1 = path1_arg;
       }
       catch (...) { m_imp_ptr.reset(); }
     }
 
     template<class Path>
     basic_filesystem_error<Path>::basic_filesystem_error(
-      const std::string & what, const path_type & path1,
-      const path_type & path2, system::error_code ec )
-      : system::system_error(ec, what)
+      const std::string & what_arg, const path_type & path1_arg,
+      const path_type & path2_arg, system::error_code ec )
+      : system::system_error(ec, what_arg)
     {
       try
       {
         m_imp_ptr.reset( new m_imp );
-        m_imp_ptr->m_path1 = path1;
-        m_imp_ptr->m_path2 = path2;
+        m_imp_ptr->m_path1 = path1_arg;
+        m_imp_ptr->m_path2 = path2_arg;
       }
       catch (...) { m_imp_ptr.reset(); }
     }