LOGCXX-500: Conflict wrongly resolved.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/91624cb0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/91624cb0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/91624cb0 Branch: refs/heads/master Commit: 91624cb0dbe3affbb603a53547d74b98f1210696 Parents: c203551 Author: Thorsten Schöning <[email protected]> Authored: Sun Aug 19 14:33:03 2018 +0200 Committer: Thorsten Schöning <[email protected]> Committed: Sun Aug 19 14:33:03 2018 +0200 ---------------------------------------------------------------------- src/main/include/log4cxx/appenderskeleton.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/91624cb0/src/main/include/log4cxx/appenderskeleton.h ---------------------------------------------------------------------- diff --git a/src/main/include/log4cxx/appenderskeleton.h b/src/main/include/log4cxx/appenderskeleton.h index d079aea..dfdabb1 100644 --- a/src/main/include/log4cxx/appenderskeleton.h +++ b/src/main/include/log4cxx/appenderskeleton.h @@ -85,6 +85,8 @@ namespace log4cxx */ virtual void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) = 0; + void doAppendImpl(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& pool); + public: DECLARE_ABSTRACT_LOG4CXX_OBJECT(AppenderSkeleton) BEGIN_LOG4CXX_CAST_MAP() @@ -119,16 +121,6 @@ namespace log4cxx public: /** - Subclasses of <code>AppenderSkeleton</code> should implement this - method to perform actual logging. See also AppenderSkeleton::doAppend - method. - */ - protected: - virtual void append(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) = 0; - - void doAppendImpl(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& pool); - - /** Clear the filters chain. */ void clearFilters();
