(logging-log4cxx) branch master updated: Simplify Configurator inheritance in the next ABI version (#667)

[swebb2066]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ee8fba12 Simplify Configurator inheritance in the next ABI version 
(#667)
ee8fba12 is described below

commit ee8fba12b4dd93542c36bb6be1077d0e996d9e8f
Author: Stephen Webb <stephen.w...@ieee.org>
AuthorDate: Fri May 15 11:20:20 2026 +1000

    Simplify Configurator inheritance in the next ABI version (#667)
    
    Co-authored-by: Stephen Webb <swebb2...@gmail.com>
---
 src/main/include/log4cxx/propertyconfigurator.h | 11 +++++++----
 src/main/include/log4cxx/xml/domconfigurator.h  |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/include/log4cxx/propertyconfigurator.h 
b/src/main/include/log4cxx/propertyconfigurator.h
index eac2aba4..38705cdd 100644
--- a/src/main/include/log4cxx/propertyconfigurator.h
+++ b/src/main/include/log4cxx/propertyconfigurator.h
@@ -245,13 +245,16 @@ The usage of custom logger factories is discouraged and 
no longer
 documented.
 
 */
-class LOG4CXX_EXPORT PropertyConfigurator :
-       virtual public spi::Configurator,
-       virtual public helpers::Object
+class LOG4CXX_EXPORT PropertyConfigurator
+#if LOG4CXX_ABI_VERSION <= 15
+       : virtual public spi::Configurator
+       , virtual public helpers::Object
+#else
+       : public spi::Configurator
+#endif
 {
 #if 15 < LOG4CXX_ABI_VERSION
        private:
-               struct PrivateData;
                LOG4CXX_DECLARE_PRIVATE_MEMBER_PTR(PrivateData, m_priv)
 #else
        protected:
diff --git a/src/main/include/log4cxx/xml/domconfigurator.h 
b/src/main/include/log4cxx/xml/domconfigurator.h
index e28d9824..028aab40 100644
--- a/src/main/include/log4cxx/xml/domconfigurator.h
+++ b/src/main/include/log4cxx/xml/domconfigurator.h
@@ -63,8 +63,12 @@ files. You can enable log4cxx internal logging by setting the
 
 <p>There are sample XML files included in the package.
 */
-class LOG4CXX_EXPORT DOMConfigurator :
-       virtual public spi::Configurator
+class LOG4CXX_EXPORT DOMConfigurator
+#if LOG4CXX_ABI_VERSION <= 15
+       : virtual public spi::Configurator
+#else
+       : public spi::Configurator
+#endif
 {
        public:
                ~DOMConfigurator();