(logging-log4cxx) branch master updated: Improve consistancy and clarity in the macros enabling Log4cxx extensions (#558)

[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 8c7aecd1 Improve consistancy and clarity in the macros enabling 
Log4cxx extensions (#558)
8c7aecd1 is described below

commit 8c7aecd1792aed335478e3508fad55545d98eb1c
Author: Stephen Webb <stephen.w...@ieee.org>
AuthorDate: Sat Nov 1 09:02:26 2025 +1100

    Improve consistancy and clarity in the macros enabling Log4cxx extensions 
(#558)
---
 src/main/include/log4cxx/helpers/object.h | 26 +++++++++++---------------
 src/main/include/log4cxx/level.h          |  9 ++++-----
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/include/log4cxx/helpers/object.h 
b/src/main/include/log4cxx/helpers/object.h
index 6dc9f049..566d1eaa 100644
--- a/src/main/include/log4cxx/helpers/object.h
+++ b/src/main/include/log4cxx/helpers/object.h
@@ -26,15 +26,13 @@
 
 #define DECLARE_LOG4CXX_CLAZZ_OBJECT(object)\
        public:\
-       class Clazz##object : public helpers::Class\
+       class Clazz##object : public LOG4CXX_NS::helpers::Class\
        {\
                public:\
-                       Clazz##object() : helpers::Class() {}\
-                       virtual ~Clazz##object() {}\
-                       virtual LOG4CXX_NS::LogString getName() const { return 
LOG4CXX_STR(#object); } \
+                       LogString getName() const override { return 
LOG4CXX_STR(#object); }\
        };\
-       static const helpers::Class& getStaticClass(); \
-       static const LOG4CXX_NS::helpers::ClassRegistration& registerClass();
+       static const helpers::Class& getStaticClass();\
+       static const helpers::ClassRegistration& registerClass();
 
 #define DECLARE_ABSTRACT_LOG4CXX_OBJECT(object)\
        DECLARE_LOG4CXX_CLAZZ_OBJECT(object)\
@@ -42,26 +40,24 @@
 
 #define DECLARE_LOG4CXX_OBJECT(object)\
        public:\
-       class Clazz##object : public helpers::Class\
+       class Clazz##object : public LOG4CXX_NS::helpers::Class\
        {\
                public:\
-                       Clazz##object() : helpers::Class() {}\
-                       virtual ~Clazz##object() {}\
-                       virtual LOG4CXX_NS::LogString getName() const { return 
LOG4CXX_STR(#object); } \
-                       virtual object* newInstance() const\
+                       LogString getName() const override { return 
LOG4CXX_STR(#object); }\
+                       object* newInstance() const override\
                        {\
                                return new object();\
                        }\
        };\
        const helpers::Class& getClass() const override;\
        static const helpers::Class& getStaticClass(); \
-       static const LOG4CXX_NS::helpers::ClassRegistration& registerClass();
+       static const helpers::ClassRegistration& registerClass();
 
 #define DECLARE_LOG4CXX_OBJECT_WITH_CUSTOM_CLASS(object, class)\
        public:\
        const helpers::Class& getClass() const override;\
        static const helpers::Class& getStaticClass();\
-       static const LOG4CXX_NS::helpers::ClassRegistration&  registerClass();
+       static const helpers::ClassRegistration& registerClass();
 
 #define IMPLEMENT_LOG4CXX_OBJECT(object)\
        const ::LOG4CXX_NS::helpers::Class& object::getClass() const { return 
getStaticClass(); }\
@@ -74,7 +70,7 @@
                return classReg; \
        }\
        namespace LOG4CXX_NS { namespace classes { \
-       const ::LOG4CXX_NS::helpers::ClassRegistration& object##Registration = 
object::registerClass(); \
+       const helpers::ClassRegistration& object##Registration = 
object::registerClass(); \
        } }
 
 
@@ -89,7 +85,7 @@
                return classReg; \
        }\
        namespace LOG4CXX_NS { namespace classes { \
-       const LOG4CXX_NS::helpers::ClassRegistration& object##Registration = 
object::registerClass(); \
+       const helpers::ClassRegistration& object##Registration = 
object::registerClass(); \
        } }
 
 namespace LOG4CXX_NS
diff --git a/src/main/include/log4cxx/level.h b/src/main/include/log4cxx/level.h
index bd78a150..707df5f2 100644
--- a/src/main/include/log4cxx/level.h
+++ b/src/main/include/log4cxx/level.h
@@ -53,7 +53,7 @@ class LOG4CXX_EXPORT Level : public helpers::Object
                        public:
                                LevelClass() : helpers::Class() {}
 
-                               virtual LogString getName() const
+                               LogString getName() const override
                                {
                                        return LOG4CXX_STR("Level");
                                }
@@ -301,11 +301,10 @@ class LOG4CXX_EXPORT Level : public helpers::Object
        class Class##level : public Level::LevelClass\
        {\
                public:\
-                       Class##level() : Level::LevelClass() {}\
-                       virtual LogString getName() const { return 
LOG4CXX_STR(#level); } \
-                       virtual LevelPtr toLevel(const LogString& sArg) const\
+                       LogString getName() const override { return 
LOG4CXX_STR(#level); } \
+                       LevelPtr toLevel(const LogString& sArg) const override\
                        { return level::toLevelLS(sArg); }\
-                       virtual LevelPtr toLevel(int val) const\
+                       LevelPtr toLevel(int val) const override\
                        { return level::toLevel(val); }\
        };\
        DECLARE_LOG4CXX_OBJECT_WITH_CUSTOM_CLASS(level, Class##level)