You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/18 00:17:44 UTC
svn commit: r613005 - /logging/log4cxx/trunk/src/main/cpp/
Author: carnold
Date: Thu Jan 17 15:17:42 2008
New Revision: 613005
URL: http://svn.apache.org/viewvc?rev=613005&view=rev
Log:
LOGCXX-222: gcc 3.2.3 compile error on LogString.append(n, c)
Modified:
logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp
logging/log4cxx/trunk/src/main/cpp/datelayout.cpp
logging/log4cxx/trunk/src/main/cpp/fileappender.cpp
logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp
logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp
logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp
logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp
logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
logging/log4cxx/trunk/src/main/cpp/timezone.cpp
logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/dailyrollingfileappender.cpp Thu Jan 17 15:17:42 2008
@@ -76,7 +76,7 @@
inLiteral = !inLiteral;
if (inLiteral && inPattern) {
- pattern.append(1, 0x7D /* '}' */);
+ pattern.append(1, (logchar) 0x7D /* '}' */);
inPattern = false;
}
} else {
@@ -91,7 +91,7 @@
}
if (inPattern) {
- pattern.append(1, 0x7D /* '}' */);
+ pattern.append(1, (logchar) 0x7D /* '}' */);
}
policy->setFileNamePattern(pattern);
Modified: logging/log4cxx/trunk/src/main/cpp/datelayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/datelayout.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/datelayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/datelayout.cpp Thu Jan 17 15:17:42 2008
@@ -115,7 +115,7 @@
if(dateFormat != 0)
{
dateFormat->format(s, event->getTimeStamp(), p);
- s.append(1, 0x20 /* ' ' */);
+ s.append(1, (logchar) 0x20 /* ' ' */);
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/fileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fileappender.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fileappender.cpp Thu Jan 17 15:17:42 2008
@@ -157,7 +157,7 @@
errors++;
LogString msg(LOG4CXX_STR("setFile("));
msg.append(fileName);
- msg.append(1, 0x2C /* ',' */);
+ msg.append(1, (logchar) 0x2C /* ',' */);
StringHelper::toString(fileAppend, msg);
msg.append(LOG4CXX_STR(") call failed."));
LogLog::error(msg, e);
Modified: logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/formattinginfo.cpp Thu Jan 17 15:17:42 2008
@@ -60,7 +60,7 @@
buffer.begin() + fieldStart + (rawLength - maxLength));
} else if (rawLength < minLength) {
if (leftAlign) {
- buffer.append(minLength - rawLength, 0x20 /* ' ' */);
+ buffer.append(minLength - rawLength, (logchar) 0x20 /* ' ' */);
} else {
buffer.insert(fieldStart, minLength - rawLength, 0x20 /* ' ' */);
}
Modified: logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp Thu Jan 17 15:17:42 2008
@@ -44,9 +44,9 @@
LogString& toAppendTo,
Pool& p) const {
append(toAppendTo, event->getLocationInformation().getFileName());
- toAppendTo.append(1, 0x28 /* '(' */);
+ toAppendTo.append(1, (logchar) 0x28 /* '(' */);
StringHelper::toString(
event->getLocationInformation().getLineNumber(),
p, toAppendTo);
- toAppendTo.append(1, 0x29 /* ')' */);
+ toAppendTo.append(1, (logchar) 0x29 /* ')' */);
}
Modified: logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/htmllayout.cpp Thu Jan 17 15:17:42 2008
@@ -117,7 +117,7 @@
const LocationInfo& locInfo = event->getLocationInformation();
LOG4CXX_DECODE_CHAR(fileName, locInfo.getFileName());
Transform::appendEscapingTags(output, fileName);
- output.append(1, 0x3A /* ':' */);
+ output.append(1, (logchar) 0x3A /* ':' */);
int line = event->getLocationInformation().getLineNumber();
if (line != 0)
{
Modified: logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp Thu Jan 17 15:17:42 2008
@@ -195,7 +195,7 @@
msg.append(LOG4CXX_STR("\" has no closing brace. Opening brace at position "));
Pool p;
StringHelper::toString(j, p, msg);
- msg.append(1, 0x2E /* '.' */);
+ msg.append(1, (logchar) 0x2E /* '.' */);
throw IllegalArgumentException(msg);
}
else
Modified: logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp Thu Jan 17 15:17:42 2008
@@ -54,21 +54,21 @@
LogString& toAppendTo,
Pool& /* p */) const {
if (option.length() == 0) {
- toAppendTo.append(1, 0x7B /* '{' */);
+ toAppendTo.append(1, (logchar) 0x7B /* '{' */);
std::set<LogString> keySet(event->getMDCKeySet());
for(std::set<LogString>::const_iterator iter = keySet.begin();
iter != keySet.end();
iter++) {
- toAppendTo.append(1, 0x7B /* '{' */);
+ toAppendTo.append(1, (logchar) 0x7B /* '{' */);
toAppendTo.append(*iter);
- toAppendTo.append(1, 0x2C /* ',' */);
+ toAppendTo.append(1, (logchar) 0x2C /* ',' */);
event->getMDC(*iter, toAppendTo);
- toAppendTo.append(1, 0x7D /* '}' */);
+ toAppendTo.append(1, (logchar) 0x7D /* '}' */);
}
- toAppendTo.append(1, 0x7D /* '}' */);
+ toAppendTo.append(1, (logchar) 0x7D /* '}' */);
} else {
event->getMDC(option, toAppendTo);
Modified: logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/simpledateformat.cpp Thu Jan 17 15:17:42 2008
@@ -151,7 +151,7 @@
if (stat == APR_SUCCESS) {
Transcoder::decode(std::string(buf, retsize), *valueIter);
} else {
- valueIter->append(1, 0x3F);
+ valueIter->append(1, (logchar) 0x3F);
}
}
}
@@ -197,8 +197,8 @@
void format(LogString& s, const apr_time_exp_t & /* tm */, Pool & /* p */ ) const
{
- s.append(1, 0x41 /* 'A' */);
- s.append(1, 0x44 /* 'D' */);
+ s.append(1, (logchar) 0x41 /* 'A' */);
+ s.append(1, (logchar) 0x44 /* 'D' */);
}
};
@@ -221,7 +221,7 @@
size_t finalLength = s.length();
if ( initialLength + width > finalLength )
{
- s.insert( initialLength, ( initialLength + width ) - finalLength, 0x30 /* '0' */);
+ s.insert( initialLength, ( initialLength + width ) - finalLength, (logchar) 0x30 /* '0' */);
}
}
@@ -544,7 +544,7 @@
{
if ( tm.tm_gmtoff == 0 )
{
- s.append( 1, 0x5A /* 'Z' */ );
+ s.append( 1, (logchar) 0x5A /* 'Z' */ );
}
else
{
Modified: logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp Thu Jan 17 15:17:42 2008
@@ -311,7 +311,7 @@
LogString SocketImpl::toString() const
{
LogString oss(address->getHostAddress());
- oss.append(1, 0x3A /* ':' */);
+ oss.append(1, (logchar) 0x3A /* ':' */);
Pool p;
StringHelper::toString(port, p, oss);
return oss;
Modified: logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/syslogappender.cpp Thu Jan 17 15:17:42 2008
@@ -287,7 +287,7 @@
LogString sbuf(1, 0x3C /* '<' */);
StringHelper::toString((syslogFacility | event->getLevel()->getSyslogEquivalent()), p, sbuf);
- sbuf.append(1, 0x3E /* '>' */);
+ sbuf.append(1, (logchar) 0x3E /* '>' */);
if (facilityPrinting)
{
sbuf.append(facilityStr);
Modified: logging/log4cxx/trunk/src/main/cpp/timezone.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/timezone.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/timezone.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/timezone.cpp Thu Jan 17 15:17:42 2008
@@ -217,19 +217,19 @@
LogString hh;
StringHelper::toString(hours, p, hh);
if (sign > 0) {
- s.append(1, 0x2B /* '+' */);
+ s.append(1, (logchar) 0x2B /* '+' */);
} else {
- s.append(1, 0x2D /* '-' */);
+ s.append(1, (logchar) 0x2D /* '-' */);
}
if (hh.length() == 1) {
- s.append(1, 0x30 /* '0' */);
+ s.append(1, (logchar) 0x30 /* '0' */);
}
s.append(hh);
- s.append(1, 0x3A /*' :' */);
+ s.append(1, (logchar) 0x3A /*' :' */);
LogString mm;
StringHelper::toString(minutes, p, mm);
if (mm.length() == 1) {
- s.append(1, 0x30 /* '0' */);
+ s.append(1, (logchar) 0x30 /* '0' */);
}
s.append(mm);
apr_int32_t offset = sign * (hours * 3600 + minutes * 60);
Modified: logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp?rev=613005&r1=613004&r2=613005&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/ttcclayout.cpp Thu Jan 17 15:17:42 2008
@@ -52,26 +52,26 @@
if(threadPrinting)
{
- output.append(1, 0x5B /* '[' */);
+ output.append(1, (logchar) 0x5B /* '[' */);
output.append(event->getThreadName());
- output.append(1, 0x5D /* ']' */);
- output.append(1, 0x20 /* ' ' */);
+ output.append(1, (logchar) 0x5D /* ']' */);
+ output.append(1, (logchar) 0x20 /* ' ' */);
}
output.append(event->getLevel()->toString());
- output.append(1, 0x20 /* ' ' */);
+ output.append(1, (logchar) 0x20 /* ' ' */);
if(categoryPrefixing)
{
output.append(event->getLoggerName());
- output.append(1, 0x20 /* ' ' */);
+ output.append(1, (logchar) 0x20 /* ' ' */);
}
if(contextPrinting && event->getNDC(output)) {
- output.append(1, 0x20 /* ' ' */);
+ output.append(1, (logchar) 0x20 /* ' ' */);
}
- output.append(1, 0x2D /* '-' */);
- output.append(1, 0x20 /* ' ' */);
+ output.append(1, (logchar) 0x2D /* '-' */);
+ output.append(1, (logchar) 0x20 /* ' ' */);
output.append(event->getRenderedMessage());
output.append(LOG4CXX_EOL);
}