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 2005/06/01 22:40:26 UTC
cvs commit: logging-log4cxx/src date.cpp integer.cpp nameabbreviator.cpp patternparser.cpp rollingpolicybase.cpp timebasedrollingpolicy.cpp
carnold 2005/06/01 13:40:26
Modified: . configure.in
include/log4cxx/helpers date.h integer.h
include/log4cxx/pattern datepatternconverter.h
filedatepatternconverter.h
filelocationpatternconverter.h formattinginfo.h
fulllocationpatternconverter.h
integerpatternconverter.h levelpatternconverter.h
linelocationpatternconverter.h
lineseparatorpatternconverter.h
messagepatternconverter.h
methodlocationpatternconverter.h
ndcpatternconverter.h patternconverter.h
patternparser.h propertiespatternconverter.h
relativetimepatternconverter.h
threadpatternconverter.h
throwableinformationpatternconverter.h
include/log4cxx/rolling filterbasedtriggeringpolicy.h
rollingpolicybase.h timebasedrollingpolicy.h
src date.cpp integer.cpp nameabbreviator.cpp
patternparser.cpp rollingpolicybase.cpp
timebasedrollingpolicy.cpp
Log:
LOGCXX-52: log4j Rolling port, Windows iter
Revision Changes Path
1.53 +6 -0 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- configure.in 30 May 2005 13:30:18 -0000 1.52
+++ configure.in 1 Jun 2005 20:40:25 -0000 1.53
@@ -392,11 +392,14 @@
include/log4cxx/config/Makefile
include/log4cxx/db/Makefile
include/log4cxx/rolling/Makefile
+include/log4cxx/pattern/Makefile
+include/log4cxx/filter/Makefile
simplesocketserver/Makefile
tests/Makefile
tests/input/Makefile
tests/input/performance/Makefile
tests/input/ndc/Makefile
+tests/input/rolling/Makefile
tests/input/xml/Makefile
tests/src/Makefile
tests/src/customlogger/Makefile
@@ -411,6 +414,9 @@
tests/src/xml/Makefile
tests/src/varia/Makefile
tests/witness/Makefile
+tests/witness/encoding/Makefile
+tests/witness/ndc/Makefile
+tests/witness/rolling/Makefile
performance/Makefile
performance/xml/Makefile
examples/Makefile
1.2 +1 -1 logging-log4cxx/include/log4cxx/helpers/date.h
Index: date.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/date.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- date.h 1 Jun 2005 18:40:24 -0000 1.1
+++ date.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -29,7 +29,7 @@
* internal strings.
*
*/
- class Date : public virtual ObjectImpl {
+ class LOG4CXX_EXPORT Date : public ObjectImpl {
const log4cxx_time_t time;
public:
1.2 +1 -1 logging-log4cxx/include/log4cxx/helpers/integer.h
Index: integer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/integer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- integer.h 1 Jun 2005 18:40:24 -0000 1.1
+++ integer.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -22,7 +22,7 @@
namespace log4cxx {
namespace helpers {
- class Integer : public virtual ObjectImpl {
+ class LOG4CXX_EXPORT Integer : public ObjectImpl {
const int val;
public:
DECLARE_LOG4CXX_OBJECT(Integer)
1.2 +3 -3 logging-log4cxx/include/log4cxx/pattern/datepatternconverter.h
Index: datepatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/datepatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- datepatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ datepatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -29,10 +29,10 @@
/**
* Convert and format the event's date in a StringBuffer.
*
- * @author Ceki Gülcü
- * @since 1.3
+ * @author Curt Arnold
+ * @since 0.9.8
*/
-class DatePatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT DatePatternConverter : public LoggingEventPatternConverter {
/**
* Date format.
*/
1.2 +2 -2 logging-log4cxx/include/log4cxx/pattern/filedatepatternconverter.h
Index: filedatepatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/filedatepatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filedatepatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ filedatepatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -28,9 +28,9 @@
* the %d pattern in pattern layout.
*
* @author Curt Arnold
- * @since 1.3
+ * @since 0.9.8
*/
-class FileDatePatternConverter {
+class LOG4CXX_EXPORT FileDatePatternConverter {
/**
* Private constructor.
*/
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/filelocationpatternconverter.h
Index: filelocationpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/filelocationpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filelocationpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ filelocationpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -29,7 +29,7 @@
* @author Ceki Gülcü
* @since 1.3
*/
-class FileLocationPatternConverter
+class LOG4CXX_EXPORT FileLocationPatternConverter
: public LoggingEventPatternConverter {
/**
* Private constructor.
1.2 +2 -5 logging-log4cxx/include/log4cxx/pattern/formattinginfo.h
Index: formattinginfo.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/formattinginfo.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- formattinginfo.h 1 Jun 2005 18:40:24 -0000 1.1
+++ formattinginfo.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -33,14 +33,11 @@
* Modifies the output of a pattern converter for a specified minimum
* and maximum width and alignment.
*
- *
- * @author <a href=mailto:jim_cakalic@na.biomerieux.com>Jim Cakalic</a>
- * @author Ceki Gülcü
* @author Curt Arnold
*
- * @since 1.3
+ * @since 0.9.8
*/
-class FormattingInfo : public virtual log4cxx::helpers::ObjectImpl {
+class LOG4CXX_EXPORT FormattingInfo : public virtual log4cxx::helpers::ObjectImpl {
/**
* Minimum length.
1.2 +3 -3 logging-log4cxx/include/log4cxx/pattern/fulllocationpatternconverter.h
Index: fulllocationpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/fulllocationpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fulllocationpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ fulllocationpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -26,10 +26,10 @@
/**
* Format the event's line location information.
*
- * @author Ceki Gülcü
- * @since 1.3
+ * @author Curt Arnold
+ * @since 0.9.8
*/
-class FullLocationPatternConverter
+class LOG4CXX_EXPORT FullLocationPatternConverter
: public LoggingEventPatternConverter {
/**
* Private constructor.
1.2 +2 -2 logging-log4cxx/include/log4cxx/pattern/integerpatternconverter.h
Index: integerpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/integerpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- integerpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ integerpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -26,9 +26,9 @@
* Formats an integer.
*
* @author Curt Arnold
- * @since 1.3
+ * @since 0.9.8
*/
-class IntegerPatternConverter : public PatternConverter {
+class LOG4CXX_EXPORT IntegerPatternConverter : public PatternConverter {
/**
* Private constructor.
1.2 +3 -3 logging-log4cxx/include/log4cxx/pattern/levelpatternconverter.h
Index: levelpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/levelpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- levelpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ levelpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -25,10 +25,10 @@
/**
* Return the event's level in a StringBuffer.
*
- * @author Ceki Gülcü
- * @since 1.3
+ * @author Curt Arnold
+ * @since 0.9.8
*/
-class LevelPatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT LevelPatternConverter : public LoggingEventPatternConverter {
/**
* Private constructor.
*/
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/linelocationpatternconverter.h
Index: linelocationpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/linelocationpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linelocationpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ linelocationpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -29,7 +29,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
-class LineLocationPatternConverter
+class LOG4CXX_EXPORT LineLocationPatternConverter
: public LoggingEventPatternConverter {
/**
* Private constructor.
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/lineseparatorpatternconverter.h
Index: lineseparatorpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/lineseparatorpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lineseparatorpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ lineseparatorpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -29,7 +29,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
-class LineSeparatorPatternConverter
+class LOG4CXX_EXPORT LineSeparatorPatternConverter
: public LoggingEventPatternConverter {
/**
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/messagepatternconverter.h
Index: messagepatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/messagepatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- messagepatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ messagepatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -28,7 +28,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
-class MessagePatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT MessagePatternConverter : public LoggingEventPatternConverter {
/**
* Private constructor.
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/methodlocationpatternconverter.h
Index: methodlocationpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/methodlocationpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- methodlocationpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ methodlocationpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -28,7 +28,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
-class MethodLocationPatternConverter
+class LOG4CXX_EXPORT MethodLocationPatternConverter
: public LoggingEventPatternConverter {
/**
1.2 +3 -3 logging-log4cxx/include/log4cxx/pattern/ndcpatternconverter.h
Index: ndcpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/ndcpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ndcpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ ndcpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -25,10 +25,10 @@
/**
* Return the event's NDC in a StringBuffer.
*
- * @author Ceki Gülcü
- * @since 1.3
+ * @author Curt Arnold
+ * @since 0.9.8
*/
-class NDCPatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT NDCPatternConverter : public LoggingEventPatternConverter {
/**
* Private constructor.
1.2 +6 -1 logging-log4cxx/include/log4cxx/pattern/patternconverter.h
Index: patternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/patternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ patternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -20,7 +20,12 @@
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/logstring.h>
-#include <vector>
+#include <vector>
+
+#ifdef _MSC_VER
+// disable identifier too wide for debugging warning
+#pragma warning (disable : 4786)
+#endif
#define DECLARE_LOG4CXX_PATTERN(cls) DECLARE_ABSTRACT_LOG4CXX_OBJECT(cls)
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/patternparser.h
Index: patternparser.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/patternparser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patternparser.h 1 Jun 2005 18:40:24 -0000 1.1
+++ patternparser.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -53,7 +53,7 @@
/**
* Escape character for format specifier.
*/
- static const logchar ESCAPE_CHAR = LOG4CXX_STR('%');
+ static const logchar ESCAPE_CHAR;
enum {
LITERAL_STATE = 0,
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/propertiespatternconverter.h
Index: propertiespatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/propertiespatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- propertiespatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ propertiespatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -32,7 +32,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
-class PropertiesPatternConverter
+class LOG4CXX_EXPORT PropertiesPatternConverter
: public LoggingEventPatternConverter {
/**
* Name of property to output.
1.2 +2 -2 logging-log4cxx/include/log4cxx/pattern/relativetimepatternconverter.h
Index: relativetimepatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/relativetimepatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- relativetimepatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ relativetimepatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -26,9 +26,9 @@
* Format the relative time in milliseconds.
*
* @author Curt Arnold
- * @since 1.3
+ * @since 0.9.8
*/
-class RelativeTimePatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT RelativeTimePatternConverter : public LoggingEventPatternConverter {
public:
DECLARE_LOG4CXX_PATTERN(RelativeTimePatternConverter)
BEGIN_LOG4CXX_CAST_MAP()
1.2 +3 -3 logging-log4cxx/include/log4cxx/pattern/threadpatternconverter.h
Index: threadpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/threadpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threadpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ threadpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -25,10 +25,10 @@
/**
* Formats the event thread name.
*
- * @author Ceki Gülcü
- * @since 1.3
+ * @author Curt Arnold
+ * @since 0.9.8
*/
-class ThreadPatternConverter : public LoggingEventPatternConverter {
+class LOG4CXX_EXPORT ThreadPatternConverter : public LoggingEventPatternConverter {
/**
* Private constructor.
*/
1.2 +1 -1 logging-log4cxx/include/log4cxx/pattern/throwableinformationpatternconverter.h
Index: throwableinformationpatternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/pattern/throwableinformationpatternconverter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- throwableinformationpatternconverter.h 1 Jun 2005 18:40:24 -0000 1.1
+++ throwableinformationpatternconverter.h 1 Jun 2005 20:40:25 -0000 1.2
@@ -30,7 +30,7 @@
* @since 0.9.8
*
*/
-class ThrowableInformationPatternConverter
+class LOG4CXX_EXPORT ThrowableInformationPatternConverter
: public LoggingEventPatternConverter {
/**
* If "short", only first line of throwable report will be formatted.
1.2 +1 -1 logging-log4cxx/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
Index: filterbasedtriggeringpolicy.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/rolling/filterbasedtriggeringpolicy.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filterbasedtriggeringpolicy.h 1 Jun 2005 18:40:25 -0000 1.1
+++ filterbasedtriggeringpolicy.h 1 Jun 2005 20:40:26 -0000 1.2
@@ -41,7 +41,7 @@
* @since 1.3
*
*/
-class FilterBasedTriggeringPolicy : public TriggeringPolicy {
+class LOG4CXX_EXPORT FilterBasedTriggeringPolicy : public TriggeringPolicy {
DECLARE_LOG4CXX_OBJECT(FilterBasedTriggeringPolicy)
BEGIN_LOG4CXX_CAST_MAP()
1.4 +1 -1 logging-log4cxx/include/log4cxx/rolling/rollingpolicybase.h
Index: rollingpolicybase.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/rolling/rollingpolicybase.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rollingpolicybase.h 1 Jun 2005 18:40:25 -0000 1.3
+++ rollingpolicybase.h 1 Jun 2005 20:40:26 -0000 1.4
@@ -35,7 +35,7 @@
* @author Curt Arnold
* @since 0.9.8
*/
- class RollingPolicyBase :
+ class LOG4CXX_EXPORT RollingPolicyBase :
public virtual RollingPolicy,
public virtual helpers::ObjectImpl {
protected:
1.4 +1 -1 logging-log4cxx/include/log4cxx/rolling/timebasedrollingpolicy.h
Index: timebasedrollingpolicy.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/rolling/timebasedrollingpolicy.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- timebasedrollingpolicy.h 1 Jun 2005 18:40:25 -0000 1.3
+++ timebasedrollingpolicy.h 1 Jun 2005 20:40:26 -0000 1.4
@@ -174,7 +174,7 @@
*/
RolloverDescriptionPtr initialize(
const LogString& file,
- bool append,
+ const bool append,
log4cxx::helpers::Pool& pool);
/**
1.2 +1 -1 logging-log4cxx/src/date.cpp
Index: date.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/date.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- date.cpp 1 Jun 2005 18:40:26 -0000 1.1
+++ date.cpp 1 Jun 2005 20:40:26 -0000 1.2
@@ -22,7 +22,7 @@
IMPLEMENT_LOG4CXX_OBJECT(Date)
-Date::Date() {
+Date::Date() : time(0) {
}
Date::Date(log4cxx_time_t t) : time(t) {
1.2 +1 -1 logging-log4cxx/src/integer.cpp
Index: integer.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/integer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- integer.cpp 1 Jun 2005 18:40:26 -0000 1.1
+++ integer.cpp 1 Jun 2005 20:40:26 -0000 1.2
@@ -22,7 +22,7 @@
IMPLEMENT_LOG4CXX_OBJECT(Integer)
-Integer::Integer() {
+Integer::Integer() : val(0){
}
Integer::Integer(int val) : val(val) {
1.2 +2 -1 logging-log4cxx/src/nameabbreviator.cpp
Index: nameabbreviator.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/nameabbreviator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nameabbreviator.cpp 1 Jun 2005 18:40:26 -0000 1.1
+++ nameabbreviator.cpp 1 Jun 2005 20:40:26 -0000 1.2
@@ -141,7 +141,8 @@
PatternAbbreviatorFragment& operator=(const PatternAbbreviatorFragment& src) {
charCount = src.charCount;
- ellipsis = src.ellipsis;
+ ellipsis = src.ellipsis;
+ return *this;
}
/**
1.36 +3 -1 logging-log4cxx/src/patternparser.cpp
Index: patternparser.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/patternparser.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- patternparser.cpp 1 Jun 2005 18:40:26 -0000 1.35
+++ patternparser.cpp 1 Jun 2005 20:40:26 -0000 1.36
@@ -20,7 +20,9 @@
using namespace log4cxx;
using namespace log4cxx::pattern;
-using namespace log4cxx::helpers;
+using namespace log4cxx::helpers;
+
+const logchar PatternParser::ESCAPE_CHAR = LOG4CXX_STR('%');
/**
1.2 +5 -1 logging-log4cxx/src/rollingpolicybase.cpp
Index: rollingpolicybase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/rollingpolicybase.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rollingpolicybase.cpp 1 Jun 2005 18:40:26 -0000 1.1
+++ rollingpolicybase.cpp 1 Jun 2005 20:40:26 -0000 1.2
@@ -109,6 +109,8 @@
return *converterIter;
}
}
+ PatternConverterPtr noMatch;
+ return noMatch;
}
PatternConverterPtr RollingPolicyBase::getDatePatternConverter() const {
@@ -120,7 +122,9 @@
if (datePattern != NULL) {
return *converterIter;
}
- }
+ }
+ PatternConverterPtr noMatch;
+ return noMatch;
}
1.2 +1 -1 logging-log4cxx/src/timebasedrollingpolicy.cpp
Index: timebasedrollingpolicy.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/timebasedrollingpolicy.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timebasedrollingpolicy.cpp 1 Jun 2005 18:40:26 -0000 1.1
+++ timebasedrollingpolicy.cpp 1 Jun 2005 20:40:26 -0000 1.2
@@ -86,7 +86,7 @@
*/
RolloverDescriptionPtr TimeBasedRollingPolicy::initialize(
const LogString& currentActiveFile,
- bool append,
+ const bool append,
Pool& pool) {
apr_time_t n = apr_time_now();
nextCheck = ((n / APR_USEC_PER_SEC) + 1) * APR_USEC_PER_SEC;