Prevent Clang warning messages

src/examples/cpp/custom-appender.cpp

@@ -34,21 +34,21 @@ class NullWriterAppender : public log4cxx::AppenderSkeleton {
 
 	NullWriterAppender(){}
 
-	virtual void close(){}
+	void close() override{}
 
-	virtual bool requiresLayout() const {
+	bool requiresLayout() const override {
 		return false;
 	}
 
-	virtual void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p){
+	void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) override {
 		// This gets called whenever there is a valid event for our appender.
 	}
 
-	virtual void activateOptions(log4cxx::helpers::Pool& /* pool */) {
+	void activateOptions(log4cxx::helpers::Pool& /* pool */) override {
 		// Given all of our options, do something useful(e.g. open a file)
 	}
 
-	virtual void setOption(const LogString& option, const LogString& value){
+	void setOption(const LogString& option, const LogString& value) override {
 		if (helpers::StringHelper::equalsIgnoreCase(option,
 										   LOG4CXX_STR("SOMEVALUE"), LOG4CXX_STR("somevalue"))){
 			// Do something with the 'value' here.

src/main/cpp/nameabbreviator.cpp

@@ -61,7 +61,7 @@ class NOPAbbreviator : public NameAbbreviator
 		/**
 		 * {@inheritDoc}
 		 */
-		void abbreviate(LogString::size_type /* nameStart */, LogString& /* buf */) const
+		void abbreviate(LogString::size_type /* nameStart */, LogString& /* buf */) const override
 		{
 		}
 };
@@ -96,7 +96,7 @@ class MaxElementAbbreviator : public NameAbbreviator
 		 * @param buf buffer to append abbreviation.
 		 * @param nameStart start of name to abbreviate.
 		 */
-		void abbreviate(LogString::size_type nameStart, LogString& buf) const
+		void abbreviate(LogString::size_type nameStart, LogString& buf) const override
 		{
 			// We substract 1 from 'len' when assigning to 'end' to avoid out of
 			// bounds exception in return r.substring(end+1, len). This can happen if
@@ -230,7 +230,7 @@ class PatternAbbreviator : public NameAbbreviator
 		 * @param buf buffer that abbreviated name is appended.
 		 * @param nameStart start of name.
 		 */
-		void abbreviate(LogString::size_type nameStart, LogString& buf) const
+		void abbreviate(LogString::size_type nameStart, LogString& buf) const override
 		{
 			//
 			//  all non-terminal patterns are executed once

src/main/cpp/namepatternconverter.cpp

@@ -70,7 +70,7 @@ NameAbbreviatorPtr NamePatternConverter::getAbbreviator(
  * @param nameStart starting position of name to abbreviate.
  * @param buf string buffer containing name.
  */
-void NamePatternConverter::abbreviate(int nameStart, LogString& buf) const
+void NamePatternConverter::abbreviate(LogString::size_type nameStart, LogString& buf) const
 {
 	priv->abbreviator->abbreviate(nameStart, buf);
 }

src/main/cpp/smtpappender.cpp

@@ -365,7 +365,7 @@ class LOG4CXX_EXPORT DefaultEvaluator :
 		has ERROR level or higher. Otherwise it returns
 		<code>false</code>.
 		*/
-		virtual bool isTriggeringEvent(const spi::LoggingEventPtr& event);
+		bool isTriggeringEvent(const spi::LoggingEventPtr& event) override;
 	private:
 		DefaultEvaluator(const DefaultEvaluator&);
 		DefaultEvaluator& operator=(const DefaultEvaluator&);

src/main/cpp/syslogappender.cpp

@@ -423,6 +423,7 @@ void SyslogAppender::setSyslogHost(const LogString& syslogHost1)
 	if (syslogHost1 != LOG4CXX_STR("localhost") && syslogHost1 != LOG4CXX_STR("127.0.0.1")
 		&& !syslogHost1.empty())
 #endif
+	{
 		if (slHostPort >= 0)
 		{
 			_priv->sw = std::make_unique<SyslogWriter>(slHost, slHostPort);
@@ -431,6 +432,7 @@ void SyslogAppender::setSyslogHost(const LogString& syslogHost1)
 		{
 			_priv->sw = std::make_unique<SyslogWriter>(slHost);
 		}
+	}
 
 	_priv->syslogHost = slHost;
 	_priv->syslogHostPort = slHostPort;

src/main/include/log4cxx/appenderskeleton.h

@@ -74,19 +74,19 @@ class LOG4CXX_EXPORT AppenderSkeleton :
 		Derived appenders should override this method if option structure
 		requires it.
 		*/
-		virtual void activateOptions(log4cxx::helpers::Pool& /* pool */) {}
-		virtual void setOption(const LogString& option, const LogString& value);
+		void activateOptions(helpers::Pool& /* pool */) override {}
+		void setOption(const LogString& option, const LogString& value) override;
 
 		/**
 		Add a filter to end of the filter list.
 		*/
-		void addFilter(const spi::FilterPtr newFilter) ;
+		void addFilter(const spi::FilterPtr newFilter) override;
 
 	public:
 		/**
 		Clear the filters chain.
 		*/
-		void clearFilters();
+		void clearFilters() override;
 
 		/**
 		Return the currently set spi::ErrorHandler for this
@@ -97,7 +97,7 @@ class LOG4CXX_EXPORT AppenderSkeleton :
 		/**
 		Returns the head Filter.
 		*/
-		spi::FilterPtr getFilter() const;
+		spi::FilterPtr getFilter() const override;
 
 		/**
 		Return the first filter in the filter chain for this
@@ -109,13 +109,13 @@ class LOG4CXX_EXPORT AppenderSkeleton :
 		/**
 		Returns the layout of this appender. The value may be nullptr.
 		*/
-		LayoutPtr getLayout() const;
+		LayoutPtr getLayout() const override;
 
 
 		/**
 		Returns the name of this Appender.
 		*/
-		LogString getName() const;
+		LogString getName() const override;
 
 		/**
 		Returns this appenders threshold level. See the #setThreshold
@@ -136,7 +136,7 @@ class LOG4CXX_EXPORT AppenderSkeleton :
 		* delegating actual logging to the subclasses specific
 		* AppenderSkeleton#append method.
 		* */
-		virtual void doAppend(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& pool);
+		void doAppend(const spi::LoggingEventPtr& event, helpers::Pool& pool) override;
 
 		/**
 		Set the {@link spi::ErrorHandler ErrorHandler} for this Appender.
@@ -149,12 +149,12 @@ class LOG4CXX_EXPORT AppenderSkeleton :
 		{@link net::SocketAppender SocketAppender} ignores the layout set
 		here.
 		*/
-		void setLayout(const LayoutPtr layout1);
+		void setLayout(const LayoutPtr layout1) override;
 
 		/**
 		Set the name of this Appender.
 		*/
-		void setName(const LogString& name1);
+		void setName(const LogString& name1) override;
 
 
 		/**

src/main/include/log4cxx/asyncappender.h

@@ -83,33 +83,33 @@ class LOG4CXX_EXPORT AsyncAppender :
 		 *
 		 * @param newAppender appender to add, may not be null.
 		*/
-		void addAppender(const AppenderPtr newAppender);
+		void addAppender(const AppenderPtr newAppender) override;
 
-		virtual void doAppend(const spi::LoggingEventPtr& event,
-			log4cxx::helpers::Pool& pool1);
+		void doAppend(const spi::LoggingEventPtr& event,
+			helpers::Pool& pool1) override;
 
-		void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p);
+		void append(const spi::LoggingEventPtr& event, helpers::Pool& p) override;
 
 		/**
 		Close this <code>AsyncAppender</code> by interrupting the
 		dispatcher thread which will process all pending events before
 		exiting.
 		*/
-		void close();
+		void close() override;
 
 		/**
 		 * Get iterator over attached appenders.
 		 * @return list of all attached appenders.
 		*/
-		AppenderList getAllAppenders() const;
+		AppenderList getAllAppenders() const override;
 
 		/**
 		 * Get appender by name.
 		 *
 		 * @param name name, may not be null.
 		 * @return matching appender or null.
 		*/
-		AppenderPtr getAppender(const LogString& name) const;
+		AppenderPtr getAppender(const LogString& name) const override;
 
 		/**
 		 * Gets whether the location of the logging request call
@@ -123,25 +123,25 @@ class LOG4CXX_EXPORT AsyncAppender :
 		* @param appender appender.
 		* @return true if attached.
 		*/
-		bool isAttached(const AppenderPtr appender) const;
+		bool isAttached(const AppenderPtr appender) const override;
 
-		virtual bool requiresLayout() const;
+		bool requiresLayout() const override;
 
 		/**
 		 * Removes and closes all attached appenders.
 		*/
-		void removeAllAppenders();
+		void removeAllAppenders() override;
 
 		/**
 		 * Removes an appender.
 		 * @param appender appender to remove.
 		*/
-		void removeAppender(const AppenderPtr appender);
+		void removeAppender(const AppenderPtr appender) override;
 		/**
 		* Remove appender by name.
 		* @param name name.
 		*/
-		void removeAppender(const LogString& name);
+		void removeAppender(const LogString& name) override;
 
 		/**
 		* The <b>LocationInfo</b> attribute is provided for compatibility
@@ -186,7 +186,7 @@ class LOG4CXX_EXPORT AsyncAppender :
 		 * @param option property name.
 		 * @param value property value.
 		 */
-		void setOption(const LogString& option, const LogString& value);
+		void setOption(const LogString& option, const LogString& value) override;
 
 
 	private:

src/main/include/log4cxx/consoleappender.h

@@ -66,8 +66,8 @@ class LOG4CXX_EXPORT ConsoleAppender : public WriterAppender
 		* */
 		LogString getTarget() const;
 
-		void activateOptions(log4cxx::helpers::Pool& p);
-		void setOption(const LogString& option, const LogString& value);
+		void activateOptions(helpers::Pool& p) override;
+		void setOption(const LogString& option, const LogString& value) override;
 		static const LogString& getSystemOut();
 		static const LogString& getSystemErr();
 

src/main/include/log4cxx/db/odbcappender.h

@@ -116,17 +116,17 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
 		/**
 		Set options
 		*/
-		virtual void setOption(const LogString& option, const LogString& value);
+		void setOption(const LogString& option, const LogString& value) override;
 
 		/**
 		Activate the specified options.
 		*/
-		virtual void activateOptions(log4cxx::helpers::Pool& p);
+		void activateOptions(helpers::Pool& p) override;
 
 		/**
 		* Adds the event to the buffer.  When full the buffer is flushed.
 		*/
-		void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool&);
+		void append(const spi::LoggingEventPtr& event, helpers::Pool&) override;
 
 		/**
 		* By default getLogStatement sends the event to the required Layout object.
@@ -173,7 +173,7 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
 		* connection if it is open.
 		*/
 	public:
-		virtual void close();
+		void close() override;
 
 		/**
 		* loops through the buffer of LoggingEvents, gets a
@@ -187,7 +187,7 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
 		/**
 		* ODBCAppender requires a layout.
 		* */
-		virtual bool requiresLayout() const
+		bool requiresLayout() const override
 		{
 			return true;
 		}

src/main/include/log4cxx/defaultloggerfactory.h

@@ -36,9 +36,7 @@ class LOG4CXX_EXPORT DefaultLoggerFactory :
 		LOG4CXX_CAST_ENTRY(spi::LoggerFactory)
 		END_LOG4CXX_CAST_MAP()
 
-		virtual LoggerPtr makeNewLoggerInstance(
-			log4cxx::helpers::Pool& pool,
-			const LogString& name) const;
+		LoggerPtr makeNewLoggerInstance(helpers::Pool& pool, const LogString& name) const override;
 };
 }  // namespace log4cxx
 

src/main/include/log4cxx/fileappender.h

@@ -117,9 +117,8 @@ class LOG4CXX_EXPORT FileAppender : public WriterAppender
 
 		<p>If there was already an opened file, then the previous file
 		is closed first.*/
-		void activateOptions(log4cxx::helpers::Pool& p);
-		void setOption(const LogString& option,
-			const LogString& value);
+		void activateOptions(helpers::Pool& p) override;
+		void setOption(const LogString& option, const LogString& value) override;
 
 		/**
 		Get the value of the <b>BufferedIO</b> option.

src/main/include/log4cxx/filter/andfilter.h

@@ -93,11 +93,11 @@ class LOG4CXX_EXPORT AndFilter: public log4cxx::spi::Filter
 		AndFilter();
 		~AndFilter();
 
-		void addFilter(const log4cxx::spi::FilterPtr& filter);
+		void addFilter(const spi::FilterPtr& filter);
 
 		void setAcceptOnMatch(bool acceptOnMatch);
 
-		FilterDecision decide(const spi::LoggingEventPtr& event) const;
+		FilterDecision decide(const spi::LoggingEventPtr& event) const override;
 };
 LOG4CXX_PTR_DEF(AndFilter);
 

src/main/include/log4cxx/filter/denyallfilter.h

@@ -58,7 +58,7 @@ class LOG4CXX_EXPORT DenyAllFilter : public spi::Filter
 		@param event The LoggingEvent to filter.
 		@return Always returns {@link spi::Filter#DENY DENY}.
 		*/
-		FilterDecision decide(const spi::LoggingEventPtr& event) const
+		FilterDecision decide(const spi::LoggingEventPtr& event) const override
 		{
 			return spi::Filter::DENY;
 		}

src/main/include/log4cxx/filter/expressionfilter.h

@@ -100,7 +100,7 @@ class LOG4CXX_EXPORT ExpressionFilter: public log4cxx::spi::Filter
 
 		ExpressionFilter();
 
-		void activateOptions(log4cxx::helpers::Pool& p);
+		void activateOptions(helpers::Pool& p) override;
 
 		void setExpression(const LogString& expression);
 
@@ -117,7 +117,7 @@ class LOG4CXX_EXPORT ExpressionFilter: public log4cxx::spi::Filter
 		/**
 		   Returns {@link log4cxx::spi::Filter#NEUTRAL} is there is no string match.
 		 */
-		FilterDecision decide(const spi::LoggingEventPtr& event) const;
+		FilterDecision decide(const spi::LoggingEventPtr& event) const override;
 };
 }
 }

src/main/include/log4cxx/filter/levelmatchfilter.h

@@ -65,8 +65,7 @@ class LOG4CXX_EXPORT LevelMatchFilter : public spi::Filter
 		/**
 		Set options
 		*/
-		virtual void setOption(const LogString& option,
-			const LogString& value);
+		void setOption(const LogString& option, const LogString& value) override;
 
 		void setLevelToMatch(const LogString& levelToMatch);
 
@@ -87,7 +86,7 @@ class LOG4CXX_EXPORT LevelMatchFilter : public spi::Filter
 		{@link spi::Filter#DENY DENY} if the
 		<b>AcceptOnMatch</b> property is set to false.
 		*/
-		FilterDecision decide(const spi::LoggingEventPtr& event) const;
+		FilterDecision decide(const spi::LoggingEventPtr& event) const override;
 }; // class LevelMatchFilter
 LOG4CXX_PTR_DEF(LevelMatchFilter);
 }  // namespace filter

src/main/include/log4cxx/filter/levelrangefilter.h

@@ -73,8 +73,7 @@ class LOG4CXX_EXPORT LevelRangeFilter : public spi::Filter
 		/**
 		Set options
 		*/
-		virtual void setOption(const LogString& option,
-			const LogString& value);
+		void setOption(const LogString& option, const LogString& value) override;
 
 		/**
 		Set the <code>LevelMin</code> option.
@@ -117,7 +116,7 @@ class LOG4CXX_EXPORT LevelRangeFilter : public spi::Filter
 		returned decision is {@link spi::Filter#DENY DENY} if the
 		<b>AcceptOnMatch</b> property is set to false.
 		*/
-		FilterDecision decide(const spi::LoggingEventPtr& event) const;
+		FilterDecision decide(const spi::LoggingEventPtr& event) const override;
 }; // class LevelRangeFilter
 LOG4CXX_PTR_DEF(LevelRangeFilter);
 }  // namespace filter