You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2013/08/07 07:31:55 UTC
svn commit: r1511179 - in /logging/log4cxx/trunk/src: changes/ main/cpp/
main/include/log4cxx/ main/include/log4cxx/helpers/
main/include/log4cxx/net/ main/include/log4cxx/rolling/
main/include/log4cxx/spi/
Author: grobmeier
Date: Wed Aug 7 05:31:54 2013
New Revision: 1511179
URL: http://svn.apache.org/r1511179
Log:
LOGCXX-366: errors when compiling under win7, thanks to Feng Nan and Christian Boos
Modified:
logging/log4cxx/trunk/src/changes/changes.xml
logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Wed Aug 7 05:31:54 2013
@@ -23,6 +23,7 @@
</properties>
<body>
<release version="0.11.0" date="2010-XX-XX" description="Maintenance release">
+<action issue="LOGCXX-366">Errors when compile log4cxx 0.10.0 under Win7 x64 with Visual Studio 2010 (due to Christian Boos and Feng Nan)</action>
<action issue="LOGCXX-414">possibly wrong use of autotools docdir (due to Alex Zbarcea)</action>
<action issue="LOGCXX-413">log4cxx doesn't compile on openembedded (due to Alex Zbarcea)</action>
<action issue="LOGCXX-249">Console appender crashes if layout is not set</action>
Modified: logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp Wed Aug 7 05:31:54 2013
@@ -24,6 +24,8 @@
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/spi/location/locationinfo.h>
+#include <iterator>
+
using namespace log4cxx;
using namespace log4cxx::pattern;
using namespace log4cxx::spi;
Modified: logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/stringhelper.cpp Wed Aug 7 05:31:54 2013
@@ -28,6 +28,7 @@
#endif
#include <log4cxx/private/log4cxx_private.h>
#include <cctype>
+#include <iterator>
#include <apr.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h Wed Aug 7 05:31:54 2013
@@ -35,6 +35,7 @@
namespace log4cxx
{
+ LOG4CXX_LIST_DEF(LoggingEventList, log4cxx::spi::LoggingEventPtr);
/**
The AsyncAppender lets users log events asynchronously. It uses a
@@ -194,7 +195,6 @@ namespace log4cxx
/**
* Event buffer.
*/
- LOG4CXX_LIST_DEF(LoggingEventList, log4cxx::spi::LoggingEventPtr);
LoggingEventList buffer;
/**
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h Wed Aug 7 05:31:54 2013
@@ -32,6 +32,7 @@ namespace log4cxx
{
namespace helpers {
+ LOG4CXX_LIST_DEF(ByteList, unsigned char);
/**
* InputStream implemented on top of a byte array.
@@ -39,7 +40,6 @@ namespace log4cxx
class LOG4CXX_EXPORT ByteArrayInputStream : public InputStream
{
private:
- LOG4CXX_LIST_DEF(ByteList, unsigned char);
ByteList buf;
size_t pos;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h Wed Aug 7 05:31:54 2013
@@ -35,13 +35,14 @@ namespace log4cxx
namespace helpers {
class Pool;
+ LOG4CXX_LIST_DEF(ByteList, unsigned char);
+
/**
* OutputStream implemented on top of std::vector
*/
class LOG4CXX_EXPORT ByteArrayOutputStream : public OutputStream
{
private:
- LOG4CXX_LIST_DEF(ByteList, unsigned char);
ByteList array;
public:
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h Wed Aug 7 05:31:54 2013
@@ -41,6 +41,9 @@ namespace log4cxx
class PatternToken;
}
+ LOG4CXX_LIST_DEF(PatternTokenList, log4cxx::helpers::SimpleDateFormatImpl::PatternToken*);
+
+
/**
* Concrete class for formatting and parsing dates in a
* locale-sensitive manner.
@@ -77,8 +80,6 @@ namespace log4cxx
/**
* List of tokens.
*/
- LOG4CXX_LIST_DEF(PatternTokenList, log4cxx::helpers::SimpleDateFormatImpl::PatternToken*);
-
PatternTokenList pattern;
static void addToken(const logchar spec, const int repeat, const std::locale* locale, PatternTokenList& pattern);
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h Wed Aug 7 05:31:54 2013
@@ -32,6 +32,7 @@ namespace log4cxx
{
namespace helpers
{
+ LOG4CXX_LIST_DEF(ByteList, unsigned char);
class LOG4CXX_EXPORT SocketOutputStream : public OutputStream
{
@@ -50,7 +51,6 @@ namespace log4cxx
virtual void write(ByteBuffer& buf, Pool& p);
private:
- LOG4CXX_LIST_DEF(ByteList, unsigned char);
ByteList array;
SocketPtr socket;
//
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h Wed Aug 7 05:31:54 2013
@@ -38,6 +38,8 @@ namespace log4cxx
}
namespace net
{
+ LOG4CXX_LIST_DEF(ObjectOutputStreamList, log4cxx::helpers::ObjectOutputStreamPtr);
+
/**
Sends {@link log4cxx::spi::LoggingEvent LoggingEvent} objects to a set of remote log
servers, usually a SocketNode.
@@ -112,7 +114,6 @@ namespace log4cxx
static int DEFAULT_PORT;
int port;
- LOG4CXX_LIST_DEF(ObjectOutputStreamList, log4cxx::helpers::ObjectOutputStreamPtr);
ObjectOutputStreamList streams;
bool locationInfo;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h Wed Aug 7 05:31:54 2013
@@ -39,6 +39,9 @@ namespace log4cxx
}
namespace net
{
+ typedef log4cxx::helpers::SocketPtr Connection;
+ LOG4CXX_LIST_DEF(ConnectionList, Connection);
+
/**
<p>The TelnetAppender is a log4cxx appender that specializes in
writing to a read-only socket. The output is provided in a
@@ -131,9 +134,6 @@ servlet.
TelnetAppender(const TelnetAppender&);
TelnetAppender& operator=(const TelnetAppender&);
- typedef log4cxx::helpers::SocketPtr Connection;
- LOG4CXX_LIST_DEF(ConnectionList, Connection);
-
void write(log4cxx::helpers::ByteBuffer&);
void writeStatus(const log4cxx::helpers::SocketPtr& socket, const LogString& msg, log4cxx::helpers::Pool& p);
ConnectionList connections;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Wed Aug 7 05:31:54 2013
@@ -32,6 +32,8 @@
namespace log4cxx
{
+ LOG4CXX_LIST_DEF(LoggingEventPatternConverterList, log4cxx::pattern::LoggingEventPatternConverterPtr);
+ LOG4CXX_LIST_DEF(FormattingInfoList, log4cxx::pattern::FormattingInfoPtr);
/**
@@ -334,13 +336,11 @@ namespace log4cxx
/**
* Pattern converters.
*/
- LOG4CXX_LIST_DEF(LoggingEventPatternConverterList, log4cxx::pattern::LoggingEventPatternConverterPtr);
LoggingEventPatternConverterList patternConverters;
/**
* Field widths and alignment corresponding to pattern converters.
*/
- LOG4CXX_LIST_DEF(FormattingInfoList, log4cxx::pattern::FormattingInfoPtr);
FormattingInfoList patternFields;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h Wed Aug 7 05:31:54 2013
@@ -34,6 +34,8 @@
namespace log4cxx {
namespace rolling {
+ LOG4CXX_LIST_DEF(PatternConverterList, log4cxx::pattern::PatternConverterPtr);
+ LOG4CXX_LIST_DEF(FormattingInfoList, log4cxx::pattern::FormattingInfoPtr);
/**
* Implements methods common to most, it not all, rolling
@@ -57,13 +59,11 @@ namespace log4cxx {
/**
* File name pattern converters.
*/
- LOG4CXX_LIST_DEF(PatternConverterList, log4cxx::pattern::PatternConverterPtr);
PatternConverterList patternConverters;
/**
* File name field specifiers.
*/
- LOG4CXX_LIST_DEF(FormattingInfoList, log4cxx::pattern::FormattingInfoPtr);
FormattingInfoList patternFields;
/**
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h?rev=1511179&r1=1511178&r2=1511179&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h Wed Aug 7 05:31:54 2013
@@ -43,6 +43,7 @@ namespace log4cxx
namespace spi
{
+ LOG4CXX_LIST_DEF(KeySet, LogString);
/**
The internal representation of logging events. When an affirmative
@@ -152,7 +153,6 @@ namespace log4cxx
*/
bool getMDC(const LogString& key, LogString& dest) const;
- LOG4CXX_LIST_DEF(KeySet, LogString);
/**
* Returns the set of of the key values in the MDC for the event.
* The returned set is unmodifiable by the caller.
@@ -168,6 +168,7 @@ namespace log4cxx
*/
void getMDCCopy() const;
+ typedef spi::KeySet KeySet;
/**
* Return a previously set property.
* @param key key.