http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/datepatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/datepatternconverter.h b/src/main/include/log4cxx/pattern/datepatternconverter.h index e556ef3..bd3711e 100644 --- a/src/main/include/log4cxx/pattern/datepatternconverter.h +++ b/src/main/include/log4cxx/pattern/datepatternconverter.h @@ -30,8 +30,8 @@ namespace log4cxx { /** * Convert and format the event's date in a StringBuffer. * - * - * + * + * */ class LOG4CXX_EXPORT DatePatternConverter : public LoggingEventPatternConverter { /**
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/filedatepatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/filedatepatternconverter.h b/src/main/include/log4cxx/pattern/filedatepatternconverter.h index 9e15239..30893ec 100644 --- a/src/main/include/log4cxx/pattern/filedatepatternconverter.h +++ b/src/main/include/log4cxx/pattern/filedatepatternconverter.h @@ -28,8 +28,8 @@ namespace log4cxx { namespace pattern { * date pattern for a %d specifier in a file name is different than * the %d pattern in pattern layout. * - * - * + * + * */ class LOG4CXX_EXPORT FileDatePatternConverter { /** http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/filelocationpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/filelocationpatternconverter.h b/src/main/include/log4cxx/pattern/filelocationpatternconverter.h index 9c053b3..65bfc10 100644 --- a/src/main/include/log4cxx/pattern/filelocationpatternconverter.h +++ b/src/main/include/log4cxx/pattern/filelocationpatternconverter.h @@ -27,8 +27,8 @@ namespace log4cxx { /** * Return the event's line location information in a StringBuffer. * - * - * + * + * */ class LOG4CXX_EXPORT FileLocationPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/formattinginfo.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/formattinginfo.h b/src/main/include/log4cxx/pattern/formattinginfo.h index c3eac5a..8b1ab1d 100644 --- a/src/main/include/log4cxx/pattern/formattinginfo.h +++ b/src/main/include/log4cxx/pattern/formattinginfo.h @@ -34,9 +34,9 @@ typedef helpers::ObjectPtrT<FormattingInfo> FormattingInfoPtr; * Modifies the output of a pattern converter for a specified minimum * and maximum width and alignment. * - * * - * + * + * */ class LOG4CXX_EXPORT FormattingInfo : public virtual log4cxx::helpers::ObjectImpl { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h b/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h index bbd7c67..df917b8 100644 --- a/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h +++ b/src/main/include/log4cxx/pattern/fulllocationpatternconverter.h @@ -27,8 +27,8 @@ namespace pattern { /** * Format the event's line location information. * - * - * + * + * */ class LOG4CXX_EXPORT FullLocationPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/integerpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/integerpatternconverter.h b/src/main/include/log4cxx/pattern/integerpatternconverter.h index 0667809..c552632 100644 --- a/src/main/include/log4cxx/pattern/integerpatternconverter.h +++ b/src/main/include/log4cxx/pattern/integerpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Formats an integer. * - * - * + * + * */ class LOG4CXX_EXPORT IntegerPatternConverter : public PatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/levelpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/levelpatternconverter.h b/src/main/include/log4cxx/pattern/levelpatternconverter.h index f0f0039..4cf7f3a 100644 --- a/src/main/include/log4cxx/pattern/levelpatternconverter.h +++ b/src/main/include/log4cxx/pattern/levelpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Return the event's level in a StringBuffer. * - * - * + * + * */ class LOG4CXX_EXPORT LevelPatternConverter : public LoggingEventPatternConverter { /** http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/linelocationpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/linelocationpatternconverter.h b/src/main/include/log4cxx/pattern/linelocationpatternconverter.h index b34d828..594171c 100644 --- a/src/main/include/log4cxx/pattern/linelocationpatternconverter.h +++ b/src/main/include/log4cxx/pattern/linelocationpatternconverter.h @@ -27,8 +27,8 @@ namespace pattern { /** * Format the event's line location information. * - * - * + * + * */ class LOG4CXX_EXPORT LineLocationPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h b/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h index 2d0a519..4f4b753 100644 --- a/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h +++ b/src/main/include/log4cxx/pattern/lineseparatorpatternconverter.h @@ -27,8 +27,8 @@ namespace pattern { /** * Formats a line separator. * - * - * + * + * */ class LOG4CXX_EXPORT LineSeparatorPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/literalpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/literalpatternconverter.h b/src/main/include/log4cxx/pattern/literalpatternconverter.h index cbcba51..4968676 100644 --- a/src/main/include/log4cxx/pattern/literalpatternconverter.h +++ b/src/main/include/log4cxx/pattern/literalpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { /** * Formats a string literal. * - * - * + * + * * */ class LOG4CXX_EXPORT LiteralPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/loggerpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/loggerpatternconverter.h b/src/main/include/log4cxx/pattern/loggerpatternconverter.h index a7d0093..ff0eba3 100644 --- a/src/main/include/log4cxx/pattern/loggerpatternconverter.h +++ b/src/main/include/log4cxx/pattern/loggerpatternconverter.h @@ -27,9 +27,9 @@ namespace log4cxx { /** * Formats a logger name. * - * * - * + * + * */ class LOG4CXX_EXPORT LoggerPatternConverter : public NamePatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h b/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h index 7118808..048366c 100644 --- a/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h +++ b/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h @@ -28,9 +28,9 @@ namespace log4cxx { * LoggingEventPatternConverter is a base class for pattern converters * that can format information from instances of LoggingEvent. * - * * - * + * + * */ class LOG4CXX_EXPORT LoggingEventPatternConverter : public PatternConverter { protected: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/messagepatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/messagepatternconverter.h b/src/main/include/log4cxx/pattern/messagepatternconverter.h index 04cd028..20b6e01 100644 --- a/src/main/include/log4cxx/pattern/messagepatternconverter.h +++ b/src/main/include/log4cxx/pattern/messagepatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Formats the message of an logging event. * - * - * + * + * */ class LOG4CXX_EXPORT MessagePatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h b/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h index da710c4..30603fc 100644 --- a/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h +++ b/src/main/include/log4cxx/pattern/methodlocationpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Return the event's line location information in a StringBuffer. * - * - * + * + * */ class LOG4CXX_EXPORT MethodLocationPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/nameabbreviator.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/nameabbreviator.h b/src/main/include/log4cxx/pattern/nameabbreviator.h index 8eedaab..092ee12 100644 --- a/src/main/include/log4cxx/pattern/nameabbreviator.h +++ b/src/main/include/log4cxx/pattern/nameabbreviator.h @@ -31,8 +31,8 @@ namespace log4cxx { /** * NameAbbreviator generates abbreviated logger and class names. * - * - * + * + * */ class LOG4CXX_EXPORT NameAbbreviator : public log4cxx::helpers::ObjectImpl { public: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/ndcpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/ndcpatternconverter.h b/src/main/include/log4cxx/pattern/ndcpatternconverter.h index a380a62..5b33df4 100644 --- a/src/main/include/log4cxx/pattern/ndcpatternconverter.h +++ b/src/main/include/log4cxx/pattern/ndcpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Return the event's NDC in a StringBuffer. * - * - * + * + * */ class LOG4CXX_EXPORT NDCPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/patternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/patternconverter.h b/src/main/include/log4cxx/pattern/patternconverter.h index f5ad142..43106c6 100644 --- a/src/main/include/log4cxx/pattern/patternconverter.h +++ b/src/main/include/log4cxx/pattern/patternconverter.h @@ -43,7 +43,7 @@ namespace log4cxx { <p>Conversion specifiers in a conversion patterns are parsed to individual PatternConverters. Each of which is responsible for converting an object in a converter specific manner. - + */ class LOG4CXX_EXPORT PatternConverter : public virtual log4cxx::helpers::ObjectImpl { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/patternparser.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/patternparser.h b/src/main/include/log4cxx/pattern/patternparser.h index 2a5113a..eab174b 100644 --- a/src/main/include/log4cxx/pattern/patternparser.h +++ b/src/main/include/log4cxx/pattern/patternparser.h @@ -49,7 +49,7 @@ typedef std::map<LogString, PatternConstructor> PatternMap; * <p>It is this class that parses conversion patterns and creates * a chained list of {@link PatternConverter PatternConverters}. * - * + * */ class LOG4CXX_EXPORT PatternParser { /** http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/propertiespatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/propertiespatternconverter.h b/src/main/include/log4cxx/pattern/propertiespatternconverter.h index bbe81c1..0c37fdf 100644 --- a/src/main/include/log4cxx/pattern/propertiespatternconverter.h +++ b/src/main/include/log4cxx/pattern/propertiespatternconverter.h @@ -30,8 +30,8 @@ namespace log4cxx { namespace pattern { * within the property bundle * when this pattern converter has the option set. * - * - * + * + * */ class LOG4CXX_EXPORT PropertiesPatternConverter : public LoggingEventPatternConverter { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/relativetimepatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/relativetimepatternconverter.h b/src/main/include/log4cxx/pattern/relativetimepatternconverter.h index 326b501..f514777 100644 --- a/src/main/include/log4cxx/pattern/relativetimepatternconverter.h +++ b/src/main/include/log4cxx/pattern/relativetimepatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Format the relative time in milliseconds. * - * - * + * + * */ class LOG4CXX_EXPORT RelativeTimePatternConverter : public LoggingEventPatternConverter { public: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/threadpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/threadpatternconverter.h b/src/main/include/log4cxx/pattern/threadpatternconverter.h index f0baff9..4c3cedd 100644 --- a/src/main/include/log4cxx/pattern/threadpatternconverter.h +++ b/src/main/include/log4cxx/pattern/threadpatternconverter.h @@ -26,8 +26,8 @@ namespace log4cxx { namespace pattern { /** * Formats the event thread name. * - * - * + * + * */ class LOG4CXX_EXPORT ThreadPatternConverter : public LoggingEventPatternConverter { /** http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h index aa8e523..f5d5641 100644 --- a/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h +++ b/src/main/include/log4cxx/pattern/throwableinformationpatternconverter.h @@ -27,8 +27,8 @@ namespace log4cxx { namespace pattern { * Outputs the ThrowableInformation portion of the LoggingiEvent as a full stacktrace * unless this converter's option is 'short', where it just outputs the first line of the trace. * - * - * + * + * * */ class LOG4CXX_EXPORT ThrowableInformationPatternConverter http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/propertyconfigurator.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/propertyconfigurator.h b/src/main/include/log4cxx/propertyconfigurator.h index 0271e2d..9afa12d 100644 --- a/src/main/include/log4cxx/propertyconfigurator.h +++ b/src/main/include/log4cxx/propertyconfigurator.h @@ -380,7 +380,7 @@ protected: void registryPut(const AppenderPtr& appender); AppenderPtr registryGet(const LogString& name); - + private: PropertyConfigurator(const PropertyConfigurator&); PropertyConfigurator& operator=(const PropertyConfigurator&); http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/provisionnode.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/provisionnode.h b/src/main/include/log4cxx/provisionnode.h index 5d1c31f..c6ec36f 100644 --- a/src/main/include/log4cxx/provisionnode.h +++ b/src/main/include/log4cxx/provisionnode.h @@ -5,16 +5,16 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ - + #ifndef _LOG4CXX_PROVISION_NODE_H #define _LOG4CXX_PROVISION_NODE_H @@ -27,7 +27,7 @@ namespace log4cxx class Logger; typedef helpers::ObjectPtrT<Logger> LoggerPtr; - + typedef std::vector<LoggerPtr> ProvisionNode; } // namespace log4cxx http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h index efe5825..310edd6 100644 --- a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h +++ b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h @@ -38,8 +38,8 @@ * by evaluating the current message against a set of filters. Unless a * filter rejects a message, a rolling event will be triggered. * - * - * + * + * * */ class LOG4CXX_EXPORT FilterBasedTriggeringPolicy : public TriggeringPolicy { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h b/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h index 1cb6b48..b5ce14c 100755 --- a/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h +++ b/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h @@ -62,8 +62,8 @@ namespace log4cxx { * larger values are specified by the user. * * - * - * + * + * * */ class LOG4CXX_EXPORT FixedWindowRollingPolicy : public RollingPolicyBase { DECLARE_LOG4CXX_OBJECT(FixedWindowRollingPolicy) http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h b/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h index 5461183..cb29794 100644 --- a/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h +++ b/src/main/include/log4cxx/rolling/manualtriggeringpolicy.h @@ -34,7 +34,7 @@ namespace log4cxx { * ManualTriggeringPolicy only rolls over on explicit calls to * RollingFileAppender.rollover(). * - * + * * */ class LOG4CXX_EXPORT ManualTriggeringPolicy : public TriggeringPolicy { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/rollingfileappender.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/rollingfileappender.h b/src/main/include/log4cxx/rolling/rollingfileappender.h index ec044fb..103e967 100755 --- a/src/main/include/log4cxx/rolling/rollingfileappender.h +++ b/src/main/include/log4cxx/rolling/rollingfileappender.h @@ -24,7 +24,7 @@ namespace log4cxx { namespace rolling { - + /** * <code>RollingFileAppender</code> extends {@link log4cxx::FileAppender} to backup the log files * depending on {@link log4cxx::rolling::RollingPolicy RollingPolicy} and {@link log4cxx::rolling::TriggeringPolicy TriggeringPolicy}. @@ -66,9 +66,9 @@ namespace log4cxx { * automatic compression of the archived files. See * {@link TimeBasedRollingPolicy} for more details. * - * - * - * + * + * + * * */ class LOG4CXX_EXPORT RollingFileAppender : public RollingFileAppenderSkeleton { DECLARE_LOG4CXX_OBJECT(RollingFileAppender) http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h b/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h index f1b73b4..f8f53f5 100644 --- a/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h +++ b/src/main/include/log4cxx/rolling/rollingfileappenderskeleton.h @@ -32,8 +32,8 @@ namespace log4cxx { /** * Base class for log4cxx::rolling::RollingFileAppender and log4cxx::RollingFileAppender * (analogues of org.apache.log4j.rolling.RFA from extras companion and - * org.apache.log4j.RFA from log4j 1.2, respectively). - * + * org.apache.log4j.RFA from log4j 1.2, respectively). + * * */ class LOG4CXX_EXPORT RollingFileAppenderSkeleton : public FileAppender { DECLARE_LOG4CXX_OBJECT(RollingFileAppenderSkeleton) @@ -141,7 +141,7 @@ namespace log4cxx { void incrementFileLength(size_t increment); }; - + LOG4CXX_PTR_DEF(RollingFileAppenderSkeleton); http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/rollingpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/rollingpolicy.h b/src/main/include/log4cxx/rolling/rollingpolicy.h index 4598d94..96a9643 100755 --- a/src/main/include/log4cxx/rolling/rollingpolicy.h +++ b/src/main/include/log4cxx/rolling/rollingpolicy.h @@ -33,8 +33,8 @@ namespace log4cxx { * is also responsible for providing the <em>active log file</em>, * that is the live file where logging output will be directed. * - * - * + * + * * */ class LOG4CXX_EXPORT RollingPolicy : http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/rollingpolicybase.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/rollingpolicybase.h b/src/main/include/log4cxx/rolling/rollingpolicybase.h index 154b17d..86bd75c 100755 --- a/src/main/include/log4cxx/rolling/rollingpolicybase.h +++ b/src/main/include/log4cxx/rolling/rollingpolicybase.h @@ -39,8 +39,8 @@ namespace log4cxx { * Implements methods common to most, it not all, rolling * policies. * - * - * + * + * */ class LOG4CXX_EXPORT RollingPolicyBase : public virtual RollingPolicy, http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h b/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h index 87ddffb..918d691 100755 --- a/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h +++ b/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h @@ -34,7 +34,7 @@ namespace log4cxx { * SizeBasedTriggeringPolicy looks at size of the file being * currently written to. * - * + * * */ class LOG4CXX_EXPORT SizeBasedTriggeringPolicy : public TriggeringPolicy { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h b/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h index d20745e..4becb3b 100755 --- a/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h +++ b/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h @@ -133,8 +133,8 @@ namespace log4cxx { * the {@link #activateOptions} method of the owning * <code>RollingFileAppender</code>. * - * - * + * + * */ class LOG4CXX_EXPORT TimeBasedRollingPolicy : public RollingPolicyBase, public TriggeringPolicy { http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/triggeringpolicy.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/triggeringpolicy.h b/src/main/include/log4cxx/rolling/triggeringpolicy.h index 6a71632..7b53ef2 100755 --- a/src/main/include/log4cxx/rolling/triggeringpolicy.h +++ b/src/main/include/log4cxx/rolling/triggeringpolicy.h @@ -35,8 +35,8 @@ namespace log4cxx { * occurs. Such conditions include time of day, file size, an * external event or a combination thereof. * - * - * + * + * * */ class LOG4CXX_EXPORT TriggeringPolicy : http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/rolling/zipcompressaction.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/rolling/zipcompressaction.h b/src/main/include/log4cxx/rolling/zipcompressaction.h index 66a19c6..559326b 100644 --- a/src/main/include/log4cxx/rolling/zipcompressaction.h +++ b/src/main/include/log4cxx/rolling/zipcompressaction.h @@ -62,7 +62,7 @@ namespace log4cxx { }; LOG4CXX_PTR_DEF(ZipCompressAction); - + } #if defined(_MSC_VER) http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/appenderattachable.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/appenderattachable.h b/src/main/include/log4cxx/spi/appenderattachable.h index 7fa06fa..bd49f0d 100644 --- a/src/main/include/log4cxx/spi/appenderattachable.h +++ b/src/main/include/log4cxx/spi/appenderattachable.h @@ -86,7 +86,7 @@ namespace log4cxx LOG4CXX_PTR_DEF(AppenderAttachable); - + } } http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/filter.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/filter.h b/src/main/include/log4cxx/spi/filter.h index 83c5dc7..80ce59b 100644 --- a/src/main/include/log4cxx/spi/filter.h +++ b/src/main/include/log4cxx/spi/filter.h @@ -87,7 +87,7 @@ namespace log4cxx log4cxx::spi::FilterPtr getNext() const; void setNext(const log4cxx::spi::FilterPtr& newNext); - + enum FilterDecision { /** http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/hierarchyeventlistener.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/hierarchyeventlistener.h b/src/main/include/log4cxx/spi/hierarchyeventlistener.h index 7112397..98e8f86 100644 --- a/src/main/include/log4cxx/spi/hierarchyeventlistener.h +++ b/src/main/include/log4cxx/spi/hierarchyeventlistener.h @@ -45,11 +45,11 @@ namespace log4cxx virtual ~HierarchyEventListener() {} virtual void addAppenderEvent( - const log4cxx::helpers::ObjectPtrT<Logger>& logger, + const log4cxx::helpers::ObjectPtrT<Logger>& logger, const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0; virtual void removeAppenderEvent( - const log4cxx::helpers::ObjectPtrT<Logger>& logger, + const log4cxx::helpers::ObjectPtrT<Logger>& logger, const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0; }; LOG4CXX_PTR_DEF(HierarchyEventListener); http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/location/locationinfo.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/location/locationinfo.h b/src/main/include/log4cxx/spi/location/locationinfo.h index c49f606..8f489ba 100644 --- a/src/main/include/log4cxx/spi/location/locationinfo.h +++ b/src/main/include/log4cxx/spi/location/locationinfo.h @@ -109,7 +109,7 @@ namespace log4cxx /** Caller's method name. */ const char * methodName; - + }; } http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/loggerfactory.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/loggerfactory.h b/src/main/include/log4cxx/spi/loggerfactory.h index 07f8be9..ff9be2f 100644 --- a/src/main/include/log4cxx/spi/loggerfactory.h +++ b/src/main/include/log4cxx/spi/loggerfactory.h @@ -35,7 +35,7 @@ namespace log4cxx DECLARE_ABSTRACT_LOG4CXX_OBJECT(LoggerFactory) virtual ~LoggerFactory() {} virtual LoggerPtr makeNewLoggerInstance( - log4cxx::helpers::Pool& pool, + log4cxx::helpers::Pool& pool, const LogString& name) const = 0; }; http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/loggerrepository.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/loggerrepository.h b/src/main/include/log4cxx/spi/loggerrepository.h index 4fe7957..1949d17 100644 --- a/src/main/include/log4cxx/spi/loggerrepository.h +++ b/src/main/include/log4cxx/spi/loggerrepository.h @@ -33,7 +33,7 @@ namespace log4cxx { namespace spi { - + /** A <code>LoggerRepository</code> is used to create and retrieve <code>Loggers</code>. The relation between loggers in a repository http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/spi/loggingevent.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/spi/loggingevent.h b/src/main/include/log4cxx/spi/loggingevent.h index 25f5c0d..74b4d0c 100644 --- a/src/main/include/log4cxx/spi/loggingevent.h +++ b/src/main/include/log4cxx/spi/loggingevent.h @@ -124,14 +124,14 @@ namespace log4cxx * should <em>never</em> be called directly. * * @param dest destination for NDC, unchanged if NDC is not set. - * @return true if NDC is set. + * @return true if NDC is set. */ bool getNDC(LogString& dest) const; /** - * Writes the content of the LoggingEvent + * Writes the content of the LoggingEvent * in a format compatible with log4j's serialized form. - */ + */ void write(helpers::ObjectOutputStream& os, helpers::Pool& p) const; /** @@ -158,7 +158,7 @@ namespace log4cxx * The returned set is unmodifiable by the caller. * * @return Set an unmodifiable set of the MDC keys. - * + * */ KeySet getMDCKeySet() const; @@ -245,9 +245,9 @@ namespace log4cxx LoggingEvent(const LoggingEvent&); LoggingEvent& operator=(const LoggingEvent&); static const LogString getCurrentThreadName(); - + static void writeProlog(log4cxx::helpers::ObjectOutputStream& os, log4cxx::helpers::Pool& p); - + }; LOG4CXX_PTR_DEF(LoggingEvent); http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/stream.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/stream.h b/src/main/include/log4cxx/stream.h index 8edec0d..915a310 100644 --- a/src/main/include/log4cxx/stream.h +++ b/src/main/include/log4cxx/stream.h @@ -31,7 +31,7 @@ namespace log4cxx * unnecessary operations. * * The logstream has a logger and level that are used for logging - * requests. The level of the stream is compared against the + * requests. The level of the stream is compared against the * current level of the logger to determine if the request should be processed. */ class LOG4CXX_EXPORT logstream_base { @@ -79,7 +79,7 @@ namespace log4cxx * Set fill character. */ int fill(int newval); - + /** * Set flags. see std::ios_base. */ @@ -92,8 +92,8 @@ namespace log4cxx * Set flags. see std::ios_base. */ std::ios_base::fmtflags setf(std::ios_base::fmtflags newflags); - - + + /** * end of message manipulator, triggers logging. */ @@ -103,21 +103,21 @@ namespace log4cxx * no-operation manipulator, Used to avoid ambiguity with VC6. */ static logstream_base& nop(logstream_base&); - + /** * end of message action. */ void end_message(); - + /** * Set the level. * @param level level */ void setLevel(const LevelPtr& level); /** - * Returns true if the current level is the same or high as the + * Returns true if the current level is the same or high as the * level of logger at time of construction or last setLevel. */ inline bool isEnabled() const { @@ -139,7 +139,7 @@ namespace log4cxx * to the state of the formatting info. * @param os stream to receive formatting info. * @param fillchar receives fill charater. - * @return true if fill character was specified. + * @return true if fill character was specified. */ bool set_stream_state(std::ios_base& os, int& fillchar); @@ -164,7 +164,7 @@ namespace log4cxx int& fill, bool& fillSet) const = 0; virtual void refresh_stream_state() = 0; - + private: /** * prevent copy constructor. @@ -180,7 +180,7 @@ namespace log4cxx */ class LOG4CXX_EXPORT logstream_ios_base : public std::ios_base { public: - logstream_ios_base(std::ios_base::fmtflags initval, + logstream_ios_base(std::ios_base::fmtflags initval, int initsize); } initset, initclear; /** @@ -208,16 +208,16 @@ namespace log4cxx */ log4cxx::spi::LocationInfo location; }; - + typedef logstream_base& (*logstream_manipulator)(logstream_base&); - + /** * An STL-like stream API for log4cxx using char as the character type. *. Instances of log4cxx::logstream * are not designedfor use by multiple threads and in general should be short-lived - * function scoped objects. Using log4cxx::basic_logstream as a class member or + * function scoped objects. Using log4cxx::basic_logstream as a class member or * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream - * in those locations. Insertion operations are generally short-circuited if the + * in those locations. Insertion operations are generally short-circuited if the * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT logstream : public logstream_base { @@ -228,31 +228,31 @@ namespace log4cxx */ logstream(const log4cxx::LoggerPtr& logger, const log4cxx::LevelPtr& level); - + /** * Constructor. */ - logstream(const Ch* loggerName, + logstream(const Ch* loggerName, const log4cxx::LevelPtr& level); /** * Constructor. */ - logstream(const std::basic_string<Ch>& loggerName, + logstream(const std::basic_string<Ch>& loggerName, const log4cxx::LevelPtr& level); - + ~logstream(); - + /** * Insertion operator for std::fixed and similar manipulators. */ logstream& operator<<(std::ios_base& (*manip)(std::ios_base&)); - + /** * Insertion operator for logstream_base::endmsg. */ logstream& operator<<(logstream_manipulator manip); - + /** * Insertion operator for level. */ @@ -261,7 +261,7 @@ namespace log4cxx * Insertion operator for location. */ logstream& operator<<(const log4cxx::spi::LocationInfo& location); - + /** * Alias for insertion operator for location. Kludge to avoid * inappropriate compiler ambiguity. @@ -273,7 +273,7 @@ namespace log4cxx */ operator std::basic_ostream<Ch>&(); -#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) +#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) /** * Template to allow any class with an std::basic_ostream inserter * to be applied to this class. @@ -285,38 +285,38 @@ namespace log4cxx } return *this; } -#endif - - +#endif + + protected: virtual void log(LoggerPtr& logger, const LevelPtr& level, const log4cxx::spi::LocationInfo& location); - + virtual void erase(); - + virtual void get_stream_state(std::ios_base& base, std::ios_base& mask, int& fill, bool& fillSet) const; virtual void refresh_stream_state(); - - + + private: logstream(const logstream&); - logstream& operator=(const logstream&); + logstream& operator=(const logstream&); std::basic_stringstream<Ch>* stream; - + }; - -#if LOG4CXX_WCHAR_T_API + +#if LOG4CXX_WCHAR_T_API /** * An STL-like stream API for log4cxx using wchar_t as the character type. *. Instances of log4cxx::logstream * are not designedfor use by multiple threads and in general should be short-lived - * function scoped objects. Using log4cxx::basic_logstream as a class member or + * function scoped objects. Using log4cxx::basic_logstream as a class member or * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream - * in those locations. Insertion operations are generally short-circuited if the + * in those locations. Insertion operations are generally short-circuited if the * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT wlogstream : public logstream_base { @@ -327,31 +327,31 @@ namespace log4cxx */ wlogstream(const log4cxx::LoggerPtr& logger, const log4cxx::LevelPtr& level); - + /** * Constructor. */ - wlogstream(const Ch* loggerName, + wlogstream(const Ch* loggerName, const log4cxx::LevelPtr& level); /** * Constructor. */ - wlogstream(const std::basic_string<Ch>& loggerName, + wlogstream(const std::basic_string<Ch>& loggerName, const log4cxx::LevelPtr& level); - + ~wlogstream(); - + /** * Insertion operator for std::fixed and similar manipulators. */ wlogstream& operator<<(std::ios_base& (*manip)(std::ios_base&)); - + /** * Insertion operator for logstream_base::endmsg. */ wlogstream& operator<<(logstream_manipulator manip); - + /** * Insertion operator for level. */ @@ -360,20 +360,20 @@ namespace log4cxx * Insertion operator for location. */ wlogstream& operator<<(const log4cxx::spi::LocationInfo& location); - + /** * Alias for insertion operator for location. Kludge to avoid * inappropriate compiler ambiguity. */ wlogstream& operator>>(const log4cxx::spi::LocationInfo& location); - + /** * Cast operator to provide access to embedded std::basic_ostream. */ operator std::basic_ostream<Ch>&(); - -#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) + +#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) /** * Template to allow any class with an std::basic_ostream inserter * to be applied to this class. @@ -385,38 +385,38 @@ namespace log4cxx } return *this; } -#endif - +#endif + protected: virtual void log(LoggerPtr& logger, const LevelPtr& level, const log4cxx::spi::LocationInfo& location); - + virtual void erase(); - + virtual void get_stream_state(std::ios_base& base, std::ios_base& mask, int& fill, bool& fillSet) const; virtual void refresh_stream_state(); - - + + private: wlogstream(const wlogstream&); wlogstream& operator=(const wlogstream&); std::basic_stringstream<Ch>* stream; - + }; #endif -#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API +#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API /** * An STL-like stream API for log4cxx using UniChar as the character type. *. Instances of log4cxx::logstream * are not designedfor use by multiple threads and in general should be short-lived - * function scoped objects. Using log4cxx::basic_logstream as a class member or + * function scoped objects. Using log4cxx::basic_logstream as a class member or * static instance should be avoided in the same manner as you would avoid placing a std::ostringstream - * in those locations. Insertion operations are generally short-circuited if the + * in those locations. Insertion operations are generally short-circuited if the * level for the stream is not the same of higher that the level of the associated logger. */ class LOG4CXX_EXPORT ulogstream : public logstream_base { @@ -427,38 +427,38 @@ namespace log4cxx */ ulogstream(const log4cxx::LoggerPtr& logger, const log4cxx::LevelPtr& level); - -#if LOG4CXX_UNICHAR_API + +#if LOG4CXX_UNICHAR_API /** * Constructor. */ - ulogstream(const Ch* loggerName, + ulogstream(const Ch* loggerName, const log4cxx::LevelPtr& level); /** * Constructor. */ - ulogstream(const std::basic_string<Ch>& loggerName, + ulogstream(const std::basic_string<Ch>& loggerName, const log4cxx::LevelPtr& level); #endif #if LOG4CXX_CFSTRING_API ulogstream(const CFStringRef& loggerName, const log4cxx::LevelPtr& level); -#endif - +#endif + ~ulogstream(); - + /** * Insertion operator for std::fixed and similar manipulators. */ ulogstream& operator<<(std::ios_base& (*manip)(std::ios_base&)); - + /** * Insertion operator for logstream_base::endmsg. */ ulogstream& operator<<(logstream_manipulator manip); - + /** * Insertion operator for level. */ @@ -467,20 +467,20 @@ namespace log4cxx * Insertion operator for location. */ ulogstream& operator<<(const log4cxx::spi::LocationInfo& location); - + /** * Alias for insertion operator for location. Kludge to avoid * inappropriate compiler ambiguity. */ ulogstream& operator>>(const log4cxx::spi::LocationInfo& location); - + /** * Cast operator to provide access to embedded std::basic_ostream. */ operator std::basic_ostream<Ch>&(); - -#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) + +#if !(LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE) /** * Template to allow any class with an std::basic_ostream inserter * to be applied to this class. @@ -492,27 +492,27 @@ namespace log4cxx } return *this; } -#endif - +#endif + protected: virtual void log(LoggerPtr& logger, const LevelPtr& level, const log4cxx::spi::LocationInfo& location); - + virtual void erase(); - + virtual void get_stream_state(std::ios_base& base, std::ios_base& mask, int& fill, bool& fillSet) const; virtual void refresh_stream_state(); - - + + private: ulogstream(const ulogstream&); ulogstream& operator=(const ulogstream&); std::basic_stringstream<Ch>* stream; - + }; #endif @@ -524,7 +524,7 @@ namespace log4cxx // // VC6 will fail to compile if class-scope templates // are used to handle arbitrary insertion operations. -// However, using global namespace insertion operations +// However, using global namespace insertion operations // run into LOGCXX-150. /** @@ -539,7 +539,7 @@ inline log4cxx::logstream& operator<<(log4cxx::logstream& os, const V& val) { return os; } -#if LOG4CXX_WCHAR_T_API +#if LOG4CXX_WCHAR_T_API /** * Template to allow any class with an std::basic_ostream inserter * to be applied to this class. http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/xml/domconfigurator.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/xml/domconfigurator.h b/src/main/include/log4cxx/xml/domconfigurator.h index 6799d54..e997f52 100644 --- a/src/main/include/log4cxx/xml/domconfigurator.h +++ b/src/main/include/log4cxx/xml/domconfigurator.h @@ -108,7 +108,7 @@ namespace log4cxx void parseErrorHandler( log4cxx::helpers::Pool& p, log4cxx::helpers::CharsetDecoderPtr& utf8Decoder, - apr_xml_elem* element, + apr_xml_elem* element, AppenderPtr& appender, apr_xml_doc* doc, AppenderMap& appenders); @@ -159,7 +159,7 @@ namespace log4cxx /** Used internally to parse the root logger element. */ - void parseRoot(log4cxx::helpers::Pool& p, + void parseRoot(log4cxx::helpers::Pool& p, log4cxx::helpers::CharsetDecoderPtr& utf8Decoder, apr_xml_elem* rootElement, apr_xml_doc* doc, AppenderMap& appenders); @@ -204,7 +204,7 @@ namespace log4cxx void parse( log4cxx::helpers::Pool& p, log4cxx::helpers::CharsetDecoderPtr& utf8Decoder, - apr_xml_elem* element, + apr_xml_elem* element, apr_xml_doc* doc, AppenderMap& appenders); @@ -289,7 +289,7 @@ namespace log4cxx protected: static LogString getAttribute( log4cxx::helpers::CharsetDecoderPtr& utf8Decoder, - apr_xml_elem*, + apr_xml_elem*, const std::string& attrName); LogString subst(const LogString& value); http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/8c3fe024/src/main/include/log4cxx/xml/xmllayout.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/xml/xmllayout.h b/src/main/include/log4cxx/xml/xmllayout.h index a0094ac..fba0ad3 100644 --- a/src/main/include/log4cxx/xml/xmllayout.h +++ b/src/main/include/log4cxx/xml/xmllayout.h @@ -86,11 +86,11 @@ namespace log4cxx */ inline bool getLocationInfo() const { return locationInfo; } - + /** * Sets whether MDC key-value pairs should be output, default false. * @param flag new value. - * + * */ inline void setProperties(bool flag) { properties = flag; @@ -99,12 +99,12 @@ namespace log4cxx /** * Gets whether MDC key-value pairs should be output. * @return true if MDC key-value pairs are output. - * + * */ inline bool getProperties() { return properties; } - + /** No options to activate. */ void activateOptions(log4cxx::helpers::Pool& /* p */) { }
