Author: carnold
Date: Fri May 9 00:16:07 2008
New Revision: 654704
URL:
http://svn.apache.org/viewvc?rev=654704&view=rev
Log:
LOGCXX-267: Local variables hide member variables
Modified:
logging/log4cxx/trunk/src/changes/changes.xml
logging/log4cxx/trunk/src/main/cpp/consoleappender.cpp
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.
cpp
logging/log4cxx/trunk/src/main/cpp/logstream.cpp
logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappend
er.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/consoleappend
er.h
Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/
trunk/src/changes/changes.xml?rev=654704&r1=654703&r
2=654704&view=diff
============================================================
==================
--- logging/log4cxx/trunk/src/changes/changes.xml
(original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Fri May 9
00:16:07 2008
 -27,6
+27,7
<action issue="LOGCXX-263">Bad link to
log4cxx-dev archive</action>
<action issue="LOGCXX-265">Eliminate
anachronism warnings</action>
<action issue="LOGCXX-266">Eliminate Extra
";" ignored warnings</action>
+<action issue="LOGCXX-267">Local variables
hide member variables</action>
<action issue="LOGCXX-271">MDC::put will
not overwrite existing key value pair</action>
<action issue="LOGCXX-272">Apache log4cxx
0.10.1 release</action>
<action issue="LOGCXX-275">Headers cannot
be included with very strict warning
settings</action>
Modified:
logging/log4cxx/trunk/src/main/cpp/consoleappender.cpp
URL: http://svn.apache.org/viewvc/logging
/log4cxx/trunk/src/main/cpp/consoleappender.cpp?rev=654704&a
mp;r1=654703&r2=654704&view=diff
============================================================
==================
--- logging/log4cxx/trunk/src/main/cpp/consoleappender.cpp
(original)
+++ logging/log4cxx/trunk/src/main/cpp/consoleappender.cpp
Fri May 9 00:16:07 2008
-36,8
+36,6
:target(getSystemOut())
{
setLayout(layout1);
- WriterPtr wr(createWriter(getSystemOut()));
- setWriter(wr);
Pool p;
WriterAppender::activateOptions(p);
}
-46,8
+44,7
: target(target1)
{
setLayout(layout1);
- WriterPtr wr(createWriter(target1));
- setWriter(wr);
+ LogString v = StringHelper::trim(target1);
Pool p;
WriterAppender::activateOptions(p);
}
-67,16
+64,6
return name;
}
-WriterPtr ConsoleAppender::createWriter(const
LogString& value) {
- LogString v = StringHelper::trim(value);
-
- if (StringHelper::equalsIgnoreCase(v,
- LOG4CXX_STR("SYSTEM.ERR"),
LOG4CXX_STR("system.err"))) {
- return new SystemErrWriter();
- }
- return new SystemOutWriter();
-}
-
void ConsoleAppender::setTarget(const LogString&
value)
{
LogString v = StringHelper::trim(value);
Modified:
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.
cpp
URL: http://svn.apache.org/viewv
c/logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappende
r.cpp?rev=654704&r1=654703&r2=654704&view=diff
============================================================
==================
---
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.
cpp (original)
+++
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.
cpp Fri May 9 00:16:07 2008
-37,11
+37,11
DailyRollingFileAppender: ailyRoll
ingFileAppender(
- const LayoutPtr& layout,
+ const LayoutPtr& l,
const LogString& filename,
const LogString& datePattern1)
: datePattern(datePattern1) {
- setLayout(layout);
+ setLayout(l);
setFile(filename);
Pool p;
activateOptions(p);
Modified: logging/log4cxx/trunk/src/main/cpp/logstream.cpp
URL: http://svn.apache.org/viewvc/logging/log4c
xx/trunk/src/main/cpp/logstream.cpp?rev=654704&r1=654703
&r2=654704&view=diff
============================================================
==================
--- logging/log4cxx/trunk/src/main/cpp/logstream.cpp
(original)
+++ logging/log4cxx/trunk/src/main/cpp/logstream.cpp Fri May
9 00:16:07 2008
-302,8
+302,8
return *this;
}
-wlogstream& wlogstream::operator<<(const
LevelPtr& level) {
- setLevel(level);
+wlogstream& wlogstream::operator<<(const
LevelPtr& l) {
+ setLevel(l);
return *this;
}
Modified:
logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappend
er.cpp
URL: http://svn.apache.org/vi
ewvc/logging/log4cxx/trunk/src/main/cpp/obsoleterollingfilea
ppender.cpp?rev=654704&r1=654703&r2=654704&view=
diff
============================================================
==================
---
logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappend
er.cpp (original)
+++
logging/log4cxx/trunk/src/main/cpp/obsoleterollingfileappend
er.cpp Fri May 9 00:16:07 2008
-64,11
+64,11
}
RollingFileAppender::RollingFileAppender(
- const LayoutPtr& layout,
+ const LayoutPtr& newLayout,
const LogString& filename,
bool append)
: maxFileSize(10*1024*1024), maxBackupIndex(1) {
- setLayout(layout);
+ setLayout(newLayout);
setFile(filename);
setAppend(append);
Pool p;
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/consoleappend
er.h
URL: http://svn.apache.org/view
vc/logging/log4cxx/trunk/src/main/include/log4cxx/consoleapp
ender.h?rev=654704&r1=654703&r2=654704&view=diff
============================================================
==================
---
logging/log4cxx/trunk/src/main/include/log4cxx/consoleappend
er.h (original)
+++
logging/log4cxx/trunk/src/main/include/log4cxx/consoleappend
er.h Fri May 9 00:16:07 2008
-69,7
+69,6
private:
void targetWarn(const LogString& val);
- static log4cxx::helpers::WriterPtr
createWriter(const LogString& target);
};
LOG4CXX_PTR_DEF(ConsoleAppender);
|
