svn commit: r495844 - in /logging/log4cxx/trunk/src: action.cpp appenderskeleton.cpp filerenameaction.cpp writerappender.cpp

[af...@apache.org]

Author: afester
Date: Fri Jan 12 22:45:42 2007
New Revision: 495844

URL: http://svn.apache.org/viewvc?view=rev&rev=495844
Log:
LOGCXX-14: fixed "parameter shaddows member" warnings

Modified:
    logging/log4cxx/trunk/src/action.cpp
    logging/log4cxx/trunk/src/appenderskeleton.cpp
    logging/log4cxx/trunk/src/filerenameaction.cpp
    logging/log4cxx/trunk/src/writerappender.cpp

Modified: logging/log4cxx/trunk/src/action.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/action.cpp?view=diff&rev=495844&r1=495843&r2=495844
==============================================================================
--- logging/log4cxx/trunk/src/action.cpp (original)
+++ logging/log4cxx/trunk/src/action.cpp Fri Jan 12 22:45:42 2007
@@ -37,11 +37,11 @@
 /**
  * {@inheritDoc}
  */
-void Action::run(log4cxx::helpers::Pool& pool) {
+void Action::run(log4cxx::helpers::Pool& pool1) {
   synchronized sync(mutex);
   if (!interrupted) {
       try {
-         execute(pool);
+         execute(pool1);
       } catch(std::exception& ex) {
          reportException(ex);
       }

Modified: logging/log4cxx/trunk/src/appenderskeleton.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/appenderskeleton.cpp?view=diff&rev=495844&r1=495843&r2=495844
==============================================================================
--- logging/log4cxx/trunk/src/appenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/appenderskeleton.cpp Fri Jan 12 22:45:42 2007
@@ -91,7 +91,7 @@
         return ((level == 0) || level->isGreaterOrEqual(threshold));
 }
 
-void AppenderSkeleton::doAppend(const spi::LoggingEventPtr& event, Pool& pool)
+void AppenderSkeleton::doAppend(const spi::LoggingEventPtr& event, Pool& pool1)
 {
         synchronized sync(mutex);
 
@@ -125,7 +125,7 @@
                  }
         }
 
-        append(event, pool);
+        append(event, pool1);
 }
 
 void AppenderSkeleton::setErrorHandler(const spi::ErrorHandlerPtr& errorHandler1)

Modified: logging/log4cxx/trunk/src/filerenameaction.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/filerenameaction.cpp?view=diff&rev=495844&r1=495843&r2=495844
==============================================================================
--- logging/log4cxx/trunk/src/filerenameaction.cpp (original)
+++ logging/log4cxx/trunk/src/filerenameaction.cpp Fri Jan 12 22:45:42 2007
@@ -30,6 +30,6 @@
    : source(toRename), destination(renameTo), renameEmptyFile(renameEmptyFile1) {
 }
 
-bool FileRenameAction::execute(log4cxx::helpers::Pool& pool) const {
-  return source.renameTo(destination, pool);
+bool FileRenameAction::execute(log4cxx::helpers::Pool& pool1) const {
+  return source.renameTo(destination, pool1);
 }

Modified: logging/log4cxx/trunk/src/writerappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/writerappender.cpp?view=diff&rev=495844&r1=495843&r2=495844
==============================================================================
--- logging/log4cxx/trunk/src/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/writerappender.cpp Fri Jan 12 22:45:42 2007
@@ -72,7 +72,7 @@
 
 
 
-void WriterAppender::append(const spi::LoggingEventPtr& event, Pool& pool)
+void WriterAppender::append(const spi::LoggingEventPtr& event, Pool& pool1)
 {
 
         if(!checkEntryConditions())
@@ -80,7 +80,7 @@
                 return;
         }
 
-        subAppend(event, pool);
+        subAppend(event, pool1);
 }
 
 /**