You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2020/08/07 15:13:45 UTC

[logging-log4cxx] 02/03: Code style.

This is an automated email from the ASF dual-hosted git repository.

tschoening pushed a commit to branch logcxx_455_quiet_mode
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 4e14be7ab25307236d08d38e1b1d93d0bff41af7
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Fri Aug 7 16:32:16 2020 +0200

    Code style.
---
 .astylerc                                   |  2 +-
 src/main/cpp/mapfilter.cpp                  |  4 ++--
 src/main/include/log4cxx/filter/mapfilter.h | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.astylerc b/.astylerc
index eee1b59..4d4ac99 100644
--- a/.astylerc
+++ b/.astylerc
@@ -20,13 +20,13 @@
 --break-one-line-headers
 --convert-tabs
 
+--indent=force-tab=4
 --indent-after-parens
 --indent-classes
 --indent-col1-comments
 --indent-preproc-block
 --indent-preproc-define
 --indent-switches
---indent=force-tab=4
 
 --lineend=linux
 --pad-comma
diff --git a/src/main/cpp/mapfilter.cpp b/src/main/cpp/mapfilter.cpp
index 09e38ca..b164ae7 100644
--- a/src/main/cpp/mapfilter.cpp
+++ b/src/main/cpp/mapfilter.cpp
@@ -33,8 +33,8 @@ MapFilter::MapFilter() : acceptOnMatch(true), mustMatchAll(false)
 
 }
 
-void MapFilter::setOption(	const LogString& option,
-							const LogString& value)
+void MapFilter::setOption(  const LogString& option,
+	const LogString& value)
 {
 	if (StringHelper::equalsIgnoreCase(option, LOG4CXX_STR("ACCEPTONMATCH"), LOG4CXX_STR("acceptonmatch")))
 	{
diff --git a/src/main/include/log4cxx/filter/mapfilter.h b/src/main/include/log4cxx/filter/mapfilter.h
index 768fbd6..77305aa 100644
--- a/src/main/include/log4cxx/filter/mapfilter.h
+++ b/src/main/include/log4cxx/filter/mapfilter.h
@@ -42,12 +42,12 @@ namespace filter
  */
 class LOG4CXX_EXPORT MapFilter: public log4cxx::spi::Filter
 {
-	typedef std::map < LogString, LogString > KeyVals;
+		typedef std::map < LogString, LogString > KeyVals;
 
 	private:
-		bool	acceptOnMatch;
-		bool	mustMatchAll; // true = AND; false = OR
-		KeyVals	keyVals;
+		bool    acceptOnMatch;
+		bool    mustMatchAll; // true = AND; false = OR
+		KeyVals keyVals;
 
 	public:
 		DECLARE_LOG4CXX_OBJECT(MapFilter)
@@ -71,8 +71,8 @@ class LOG4CXX_EXPORT MapFilter: public log4cxx::spi::Filter
 
 		inline const LogString& getValue(const LogString& strKey) const
 		{
-			static	const LogString					empty;
-					const KeyVals::const_iterator	it(this->keyVals.find(strKey));
+			static  const LogString                 empty;
+			const KeyVals::const_iterator   it(this->keyVals.find(strKey));
 
 			return (it != keyVals.end() ? it->second : empty);
 		}