svn commit: r420595 - in /logging/log4cxx/trunk/performance: main.cpp nullappender.cpp

[afester]

Author: afester
Date: Mon Jul 10 11:01:38 2006
New Revision: 420595

URL: http://svn.apache.org/viewvc?rev=420595&view=rev
Log:
LOGCXX-14: next part for fix of "declaration of ‘local’ shadows a member of 
'this'" when compiling with g++ -Wshadow

Modified:
    logging/log4cxx/trunk/performance/main.cpp
    logging/log4cxx/trunk/performance/nullappender.cpp

Modified: logging/log4cxx/trunk/performance/main.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/main.cpp?rev=420595&r1=420594&r2=420595&view=diff
==============================================================================
--- logging/log4cxx/trunk/performance/main.cpp (original)
+++ logging/log4cxx/trunk/performance/main.cpp Mon Jul 10 11:01:38 2006
@@ -117,30 +117,30 @@
     }
   }
 
-  static long loopChar(long len, LoggerPtr& logger) {
+  static long loopChar(long len, LoggerPtr& logger1) {
     const char* msg = "Some fix message of medium length.";
     apr_time_t before = apr_time_now();
     for (int i = 0; i < len; i++) {
-      LOG4CXX_DEBUG(logger, msg);
+      LOG4CXX_DEBUG(logger1, msg);
     }
     return (apr_time_now() - before) / 1000;
   }
 
- #if LOG4CXX_HAS_WCHAR_T
-  static long loopWide(long len, LoggerPtr& logger) {
+#if LOG4CXX_HAS_WCHAR_T
+  static long loopWide(long len, LoggerPtr& logger1) {
     const wchar_t* msg = L"Some fix message of medium length.";
     apr_time_t before = apr_time_now();
     for (int i = 0; i < len; i++) {
-      LOG4CXX_DEBUG(logger, msg);
+      LOG4CXX_DEBUG(logger1, msg);
     }
     return (apr_time_now() - before) / 1000;
   }
 #endif
 
-  static long loopStream(long len, LoggerPtr& logger) {
+  static long loopStream(long len, LoggerPtr& logger1) {
     const char* msg = "Some fix message of medium length.";
     apr_time_t before = apr_time_now();
-    logstream ls(logger, Level::DEBUG);
+    logstream ls(logger1, Level::DEBUG);
     for (int i = 0; i < len; i++) {
       ls << msg << LOG4CXX_ENDMSG;
     }
@@ -148,10 +148,10 @@
   }
 
 #if LOG4CXX_HAS_WCHAR_T
-   static long loopWideStream(long len, LoggerPtr& logger) {
+   static long loopWideStream(long len, LoggerPtr& logger1) {
     const wchar_t* msg = L"Some fix message of medium length.";
     apr_time_t before = apr_time_now();
-    logstream ls(logger, Level::DEBUG);
+    logstream ls(logger1, Level::DEBUG);
     for (int i = 0; i < len; i++) {
       ls << msg << LOG4CXX_ENDMSG;
     }
@@ -159,22 +159,22 @@
   }
 #endif
 
-  static long loopBadStream(long len, LoggerPtr& logger) {
+  static long loopBadStream(long len, LoggerPtr& logger1) {
     const char* msg = "Some fix message of medium length.";
     apr_time_t before = apr_time_now();
     for (int i = 0; i < len; i++) {
-      logstream ls(logger, Level::DEBUG);
+      logstream ls(logger1, Level::DEBUG);
       ls << msg << LOG4CXX_ENDMSG;
     }
     return (apr_time_now() - before) / 1000;
   }
 
 #if LOG4CXX_HAS_WCHAR_T
-   static long loopBadWideStream(long len, LoggerPtr& logger) {
+   static long loopBadWideStream(long len, LoggerPtr& logger1) {
     const wchar_t* msg = L"Some fix message of medium length.";
     apr_time_t before = apr_time_now();
     for (int i = 0; i < len; i++) {
-      logstream ls(logger, Level::DEBUG);
+      logstream ls(logger1, Level::DEBUG);
       ls << msg << LOG4CXX_ENDMSG;
     }
     return (apr_time_now() - before) / 1000;

Modified: logging/log4cxx/trunk/performance/nullappender.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/nullappender.cpp?rev=420595&r1=420594&r2=420595&view=diff
==============================================================================
--- logging/log4cxx/trunk/performance/nullappender.cpp (original)
+++ logging/log4cxx/trunk/performance/nullappender.cpp Mon Jul 10 11:01:38 2006
@@ -28,9 +28,9 @@
 {
 }
 
-NullAppender::NullAppender(const LayoutPtr& layout)
+NullAppender::NullAppender(const LayoutPtr& layout1)
 {
-        this->layout = layout;
+        this->layout = layout1;
 }
 
 void NullAppender::close()