Author: afester
Date: Mon Jul 10 11:42:38 2006
New Revision: 420609
URL: http://svn.apache.org/viewvc?rev=420609&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/include/log4cxx/appenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/fileappender.h
logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h
logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h
logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h
logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h
logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h
logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h
logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h
logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h
logging/log4cxx/trunk/include/log4cxx/htmllayout.h
logging/log4cxx/trunk/include/log4cxx/level.h
logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h
logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h
logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h
logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h
logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h
logging/log4cxx/trunk/include/log4cxx/ttcclayout.h
logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h
Modified: logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/appenderskeleton.h Mon Jul 10
11:42:38 2006
@@ -172,12 +172,12 @@
[EMAIL PROTECTED] net::SocketAppender SocketAppender} ignores
the layout set
here.
*/
- void setLayout(const LayoutPtr& layout) { this->layout =
layout; }
+ void setLayout(const LayoutPtr& layout1) { this->layout =
layout1; }
/**
Set the name of this Appender.
*/
- void setName(const LogString& name) { this->name.assign(name);
}
+ void setName(const LogString& name1) {
this->name.assign(name1); }
/**
Modified: logging/log4cxx/trunk/include/log4cxx/fileappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/fileappender.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/fileappender.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/fileappender.h Mon Jul 10 11:42:38
2006
@@ -185,13 +185,8 @@
<p>Note: Actual opening of the file is made when
#activateOptions is called, not when the options are set.
*/
- inline void setAppend(bool fileAppend)
- { this->fileAppend = fileAppend; }
-
-
- inline void getAppend(bool append) {
- fileAppend = append;
- }
+ inline void setAppend(bool fileAppend1)
+ { this->fileAppend = fileAppend1; }
/**
The <b>BufferedIO</b> option takes a boolean value. It is set
to
@@ -207,7 +202,7 @@
/**
Set the size of the IO buffer.
*/
- void setBufferSize(int bufferSize) { this->bufferSize =
bufferSize; }
+ void setBufferSize(int bufferSize1) { this->bufferSize =
bufferSize1; }
/**
* Replaces double backslashes with single backslashes
Modified: logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/filter/levelmatchfilter.h Mon Jul 10
11:42:38 2006
@@ -67,8 +67,8 @@
const LogString& getLevelToMatch() const;
- inline void setAcceptOnMatch(bool acceptOnMatch)
- { this->acceptOnMatch = acceptOnMatch; }
+ inline void setAcceptOnMatch(bool acceptOnMatch1)
+ { this->acceptOnMatch = acceptOnMatch1; }
inline bool getAcceptOnMatch() const
{ return acceptOnMatch; }
Modified: logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/filter/levelrangefilter.h Mon Jul 10
11:42:38 2006
@@ -85,8 +85,8 @@
/**
Set the <code>LevelMin</code> option.
*/
- void setLevelMin(const LevelPtr& levelMin)
- { this->levelMin = levelMin; }
+ void setLevelMin(const LevelPtr& levelMin1)
+ { this->levelMin = levelMin1; }
/**
Get the value of the <code>LevelMin</code> option.
@@ -97,8 +97,8 @@
/**
Set the <code>LevelMax</code> option.
*/
- void setLevelMax(const LevelPtr& levelMax)
- { this->levelMax = levelMax; }
+ void setLevelMax(const LevelPtr& levelMax1)
+ { this->levelMax = levelMax1; }
/**
Get the value of the <code>LevelMax</code> option.
@@ -109,8 +109,8 @@
/**
Set the <code>AcceptOnMatch</code> option.
*/
- inline void setAcceptOnMatch(bool acceptOnMatch)
- { this->acceptOnMatch = acceptOnMatch; }
+ inline void setAcceptOnMatch(bool acceptOnMatch1)
+ { this->acceptOnMatch = acceptOnMatch1; }
/**
Get the value of the <code>AcceptOnMatch</code> option.
Modified: logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/filter/stringmatchfilter.h Mon Jul 10
11:42:38 2006
@@ -69,14 +69,14 @@
virtual void setOption(const LogString& option,
const LogString& value);
- inline void setStringToMatch(const LogString&
stringToMatch)
- { this->stringToMatch.assign(stringToMatch); }
+ inline void setStringToMatch(const LogString&
stringToMatch1)
+ { this->stringToMatch.assign(stringToMatch1); }
inline const LogString& getStringToMatch() const
{ return stringToMatch; }
- inline void setAcceptOnMatch(bool acceptOnMatch)
- { this->acceptOnMatch = acceptOnMatch; }
+ inline void setAcceptOnMatch(bool acceptOnMatch1)
+ { this->acceptOnMatch = acceptOnMatch1; }
inline bool getAcceptOnMatch() const
{ return acceptOnMatch; }
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/datagrampacket.h Mon Jul 10
11:42:38 2006
@@ -104,23 +104,23 @@
inline int getPort() const
{ return port; }
- inline void setAddress(InetAddressPtr address)
- { this->address = address; }
+ inline void setAddress(InetAddressPtr address1)
+ { this->address = address1; }
/** Set the data buffer for this packet. */
- inline void setData(void * buf)
- { this->buf = buf; }
+ inline void setData(void * buf1)
+ { this->buf = buf1; }
/** Set the data buffer for this packet. */
- inline void setData(void * buf, int offset, int length)
- { this->buf = buf; this->offset = offset;
this->length = length; }
+ inline void setData(void * buf1, int offset1, int
length1)
+ { this->buf = buf1; this->offset = offset1;
this->length = length1; }
/** Set the length for this packet. */
- inline void setLength(int length)
- { this->length = length; }
+ inline void setLength(int length1)
+ { this->length = length1; }
- inline void setPort(int port)
- { this->port = port; }
+ inline void setPort(int port1)
+ { this->port = port1; }
private:
//
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/datelayout.h Mon Jul 10
11:42:38 2006
@@ -51,8 +51,8 @@
the strings <b>"NULL"</b>, <b>"RELATIVE"</b>,
<b>"ABSOLUTE"</b>,
<b>"DATE"</b> or <b>"ISO8601</b>.
*/
- inline void setDateFormat(const LogString& dateFormat)
- { this->dateFormatOption.assign(dateFormat); }
+ inline void setDateFormat(const LogString& dateFormat1)
+ { this->dateFormatOption.assign(dateFormat1); }
/**
Returns value of the <b>DateFormat</b> option.
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/filewatchdog.h Mon Jul 10
11:42:38 2006
@@ -64,8 +64,8 @@
/**
Set the delay to observe between each check of the
file changes.
*/
- void setDelay(long delay)
- { this->delay = delay; }
+ void setDelay(long delay1)
+ { this->delay = delay1; }
void start();
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/objectptr.h Mon Jul 10
11:42:38 2006
@@ -35,10 +35,10 @@
template<typename T> class ObjectPtrT
{
public:
- template<typename InterfacePtr> ObjectPtrT(const InterfacePtr& p)
+ template<typename InterfacePtr> ObjectPtrT(const InterfacePtr& p1)
: p(0)
{
- cast(p);
+ cast(p1);
}
@@ -52,7 +52,7 @@
{
}
- ObjectPtrT(T * p) : p(p)
+ ObjectPtrT(T * p1) : p(p1)
{
if (this->p != 0)
{
@@ -60,7 +60,7 @@
}
}
- ObjectPtrT(const ObjectPtrT& p) : p(p.p)
+ ObjectPtrT(const ObjectPtrT& p1) : p(p1.p)
{
if (this->p != 0)
{
@@ -77,14 +77,14 @@
}
// Operators
- template<typename InterfacePtr> ObjectPtrT& operator=(const
InterfacePtr& p)
+ template<typename InterfacePtr> ObjectPtrT& operator=(const
InterfacePtr& p1)
{
- cast(p);
+ cast(p1);
return *this;
}
- ObjectPtrT& operator=(const ObjectPtrT& p) {
- T* newPtr = (T*) p.p;
+ ObjectPtrT& operator=(const ObjectPtrT& p1) {
+ T* newPtr = (T*) p1.p;
if (newPtr != 0) {
newPtr->addRef();
}
@@ -108,32 +108,32 @@
return *this;
}
- ObjectPtrT& operator=(T* p) {
- if (p != 0) {
- p->addRef();
+ ObjectPtrT& operator=(T* p1) {
+ if (p1 != 0) {
+ p1->addRef();
}
- void* oldPtr = ObjectPtrBase::exchange((volatile void**)
&this->p, p);
+ void* oldPtr = ObjectPtrBase::exchange((volatile void**)
&this->p, p1);
if (oldPtr != 0) {
((T*)oldPtr)->releaseRef();
}
return *this;
}
- bool operator==(const ObjectPtrT& p) const { return (this->p ==
p.p); }
- bool operator!=(const ObjectPtrT& p) const { return (this->p !=
p.p); }
- bool operator==(const T* p) const { return (this->p == p); }
- bool operator!=(const T* p) const { return (this->p != p); }
+ bool operator==(const ObjectPtrT& p1) const { return (this->p ==
p1.p); }
+ bool operator!=(const ObjectPtrT& p1) const { return (this->p !=
p1.p); }
+ bool operator==(const T* p1) const { return (this->p == p1); }
+ bool operator!=(const T* p1) const { return (this->p != p1); }
T* operator->() {return (T*) p; }
const T* operator->() const {return (const T*) p; }
T& operator*() const {return (T&) *p; }
operator T*() const {return (T*) p; }
- template<typename InterfacePtr> void cast(const InterfacePtr& p)
+ template<typename InterfacePtr> void cast(const InterfacePtr& p1)
{
T* newPtr = 0;
- if (p != 0)
+ if (p1 != 0)
{
- newPtr = (T*)p->cast(T::getStaticClass());
+ newPtr = (T*)p1->cast(T::getStaticClass());
}
operator=(newPtr);
}
Modified: logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/helpers/resourcebundle.h Mon Jul 10
11:42:38 2006
@@ -70,8 +70,8 @@
Parameters:
parent - this bundle's parent bundle.
*/
- inline void setParent(const ResourceBundlePtr& parent)
- { this->parent = parent; }
+ inline void setParent(const ResourceBundlePtr& parent1)
+ { this->parent = parent1; }
/**
The parent bundle of this bundle.
Modified: logging/log4cxx/trunk/include/log4cxx/htmllayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/htmllayout.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/htmllayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/htmllayout.h Mon Jul 10 11:42:38 2006
@@ -60,8 +60,8 @@
[EMAIL PROTECTED] net::SMTPAppender SMTPAppender} then make
sure
to set the <b>LocationInfo</b> option of that appender as well.
*/
- inline void setLocationInfo(bool flocationInfoag)
- { this->locationInfo = locationInfo; }
+ inline void setLocationInfo(bool locationInfoFlag)
+ { this->locationInfo = locationInfoFlag; }
/**
Returns the current value of the <b>LocationInfo</b> option.
@@ -74,8 +74,8 @@
document title of the generated HTML document.
<p>Defaults to 'Log4cxx Log Messages'.
*/
- inline void setTitle(const LogString& title)
- { this->title.assign(title); }
+ inline void setTitle(const LogString& title1)
+ { this->title.assign(title1); }
/**
Returns the current value of the <b>Title</b> option.
Modified: logging/log4cxx/trunk/include/log4cxx/level.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/level.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/level.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/level.h Mon Jul 10 11:42:38 2006
@@ -180,11 +180,11 @@
*/
virtual bool equals(const LevelPtr& level) const;
- inline bool operator==(const Level& level) const
- { return (this->level == level.level); }
+ inline bool operator==(const Level& level1) const
+ { return (this->level == level1.level); }
- inline bool operator!=(const Level& level) const
- { return (this->level != level.level); }
+ inline bool operator!=(const Level& level1) const
+ { return (this->level != level1.level); }
/**
Return the syslog equivalent of this level as an integer.
Modified: logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h
(original)
+++ logging/log4cxx/trunk/include/log4cxx/net/socketappenderskeleton.h Mon Jul
10 11:42:38 2006
@@ -122,8 +122,8 @@
The <b>Port</b> option takes a positive integer representing
the port where the server is waiting for connections.
*/
- void setPort(int port)
- { this->port = port; }
+ void setPort(int port1)
+ { this->port = port1; }
/**
Returns value of the <b>Port</b> option.
@@ -136,8 +136,8 @@
the information sent to the remote host will include location
information. By default no location information is sent to the
server.
*/
- void setLocationInfo(bool locationInfo)
- { this->locationInfo = locationInfo; }
+ void setLocationInfo(bool locationInfo1)
+ { this->locationInfo = locationInfo1; }
/**
Returns value of the <b>LocationInfo</b> option.
@@ -154,8 +154,8 @@
<p>Setting this option to zero turns off reconnection
capability.
*/
- void setReconnectionDelay(int reconnectionDelay)
- { this->reconnectionDelay = reconnectionDelay; }
+ void setReconnectionDelay(int reconnectionDelay1)
+ { this->reconnectionDelay = reconnectionDelay1; }
/**
Returns value of the <b>ReconnectionDelay</b> option.
Modified: logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/net/sockethubappender.h Mon Jul 10
11:42:38 2006
@@ -157,8 +157,8 @@
/**
The <b>Port</b> option takes a positive integer
representing
the port where the server is waiting for connections.
*/
- inline void setPort(int port)
- { this->port = port; }
+ inline void setPort(int port1)
+ { this->port = port1; }
/**
Returns value of the <b>Port</b> option. */
@@ -169,8 +169,8 @@
The <b>LocationInfo</b> option takes a boolean value.
If true,
the information sent to the remote host will include
location
information. By default no location information is
sent to the server. */
- inline void setLocationInfo(bool locationInfo)
- { this->locationInfo = locationInfo; }
+ inline void setLocationInfo(bool locationInfo1)
+ { this->locationInfo = locationInfo1; }
/**
Returns value of the <b>LocationInfo</b> option. */
Modified: logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/net/syslogappender.h Mon Jul 10
11:42:38 2006
@@ -114,8 +114,8 @@
message will include the facility name of the
application. It is
<em>false</em> by default.
*/
- inline void setFacilityPrinting(bool facilityPrinting)
- { this->facilityPrinting = facilityPrinting; }
+ inline void setFacilityPrinting(bool facilityPrinting1)
+ { this->facilityPrinting = facilityPrinting1; }
/**
Returns the value of the <b>FacilityPrinting</b>
option.
Modified: logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/net/telnetappender.h Mon Jul 10
11:42:38 2006
@@ -104,8 +104,8 @@
The <b>Port</b> option takes a
positive integer representing
the port where the server is
waiting for connections.
*/
- void setPort(int port)
- { this->port = port; }
+ void setPort(int port1)
+ { this->port = port1; }
/** shuts down the appender. */
Modified: logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h
(original)
+++ logging/log4cxx/trunk/include/log4cxx/spi/defaultrepositoryselector.h Mon
Jul 10 11:42:38 2006
@@ -35,8 +35,8 @@
LOG4CXX_CAST_ENTRY(RepositorySelector)
END_LOG4CXX_CAST_MAP()
- DefaultRepositorySelector(const LoggerRepositoryPtr&
repository)
- : repository(repository)
+ DefaultRepositorySelector(const LoggerRepositoryPtr&
repository1)
+ : repository(repository1)
{
}
Modified: logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/spi/location/locationinfo.h Mon Jul
10 11:42:38 2006
@@ -117,10 +117,10 @@
* location info for current code site and
* flush a logging stream
*/
- LocationFlush( const char * const fileName,
- const char * const methodName,
- int lineNumber )
- : LocationInfo( fileName, methodName, lineNumber ) {
+ LocationFlush( const char * const fileName1,
+ const char * const methodName1,
+ int lineNumber1 )
+ : LocationInfo( fileName1, methodName1, lineNumber1 ) {
}
};
Modified: logging/log4cxx/trunk/include/log4cxx/ttcclayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/ttcclayout.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/ttcclayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/ttcclayout.h Mon Jul 10 11:42:38 2006
@@ -101,8 +101,8 @@
The <b>ThreadPrinting</b> option specifies whether the name of the
current thread is part of log output or not. This is true by default.
*/
- inline void setThreadPrinting(bool threadPrinting)
- { this->threadPrinting = threadPrinting; }
+ inline void setThreadPrinting(bool threadPrinting1)
+ { this->threadPrinting = threadPrinting1; }
/**
Returns value of the <b>ThreadPrinting</b> option.
@@ -114,8 +114,8 @@
The <b>CategoryPrefixing</b> option specifies whether Logger
name is part of log output or not. This is true by default.
*/
- inline void setCategoryPrefixing(bool categoryPrefixing)
- { this->categoryPrefixing = categoryPrefixing; }
+ inline void setCategoryPrefixing(bool categoryPrefixing1)
+ { this->categoryPrefixing = categoryPrefixing1; }
/**
Returns value of the <b>CategoryPrefixing</b> option.
@@ -128,8 +128,8 @@
the nested context information belonging to the current thread.
This is true by default.
*/
- inline void setContextPrinting(bool contextPrinting)
- { this->contextPrinting = contextPrinting; }
+ inline void setContextPrinting(bool contextPrinting1)
+ { this->contextPrinting = contextPrinting1; }
/**
Returns value of the <b>ContextPrinting</b> option.
@@ -141,8 +141,8 @@
The <b>FilePrinting</b> option specifies log output will include
the file and the line where the log statement was written.
*/
- inline void setFilePrinting(bool filePrinting)
- { this->filePrinting = filePrinting; }
+ inline void setFilePrinting(bool filePrinting1)
+ { this->filePrinting = filePrinting1; }
/**
Returns value of the <b>ContextPrinting</b> option.
Modified: logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h?rev=420609&r1=420608&r2=420609&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h (original)
+++ logging/log4cxx/trunk/include/log4cxx/xml/xmllayout.h Mon Jul 10 11:42:38
2006
@@ -79,8 +79,8 @@
then make sure to set the
<b>LocationInfo</b> option of that appender as well.
*/
- inline void setLocationInfo(bool locationInfo)
- { this->locationInfo = locationInfo; }
+ inline void setLocationInfo(bool locationInfo1)
+ { this->locationInfo = locationInfo1; }
/**
Returns the current value of the <b>LocationInfo</b>
option.
