You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sw...@apache.org on 2024/10/25 05:01:57 UTC
(logging-log4cxx) branch next_abi_version_cleanup created (now b90ae4ac)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a change to branch next_abi_version_cleanup
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
at b90ae4ac Simplify the Class interface in the next ABI
This branch includes the following new commits:
new b90ae4ac Simplify the Class interface in the next ABI
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(logging-log4cxx) 01/01: Simplify the Class interface in the next ABI
Posted by sw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch next_abi_version_cleanup
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit b90ae4ac2245d2b7698a70bcffd2fa153f216130
Author: Stephen Webb <sw...@gmail.com>
AuthorDate: Fri Oct 25 16:01:26 2024 +1100
Simplify the Class interface in the next ABI
---
src/main/cpp/class.cpp | 2 ++
src/main/cpp/optionconverter.cpp | 2 +-
src/main/include/log4cxx/helpers/class.h | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/cpp/class.cpp b/src/main/cpp/class.cpp
index f04c4ef2..35b46e86 100644
--- a/src/main/cpp/class.cpp
+++ b/src/main/cpp/class.cpp
@@ -98,10 +98,12 @@ Class::~Class()
{
}
+#if LOG4CXX_ABI_VERSION <= 15
LogString Class::toString() const
{
return getName();
}
+#endif
Object* Class::newInstance() const
{
diff --git a/src/main/cpp/optionconverter.cpp b/src/main/cpp/optionconverter.cpp
index eb30bcbe..59343410 100644
--- a/src/main/cpp/optionconverter.cpp
+++ b/src/main/cpp/optionconverter.cpp
@@ -429,7 +429,7 @@ void OptionConverter::selectAndConfigure(const File& configFileName,
filename.substr(filename.length() - 4),
LOG4CXX_STR(".XML"), LOG4CXX_STR(".xml")))
{
- clazz = LOG4CXX_NS::xml::DOMConfigurator::getStaticClass().toString();
+ clazz = LOG4CXX_NS::xml::DOMConfigurator::getStaticClass().getName();
}
#endif
diff --git a/src/main/include/log4cxx/helpers/class.h b/src/main/include/log4cxx/helpers/class.h
index 0315ebcd..199dd6f1 100644
--- a/src/main/include/log4cxx/helpers/class.h
+++ b/src/main/include/log4cxx/helpers/class.h
@@ -33,7 +33,9 @@ class LOG4CXX_EXPORT Class
public:
virtual ~Class();
virtual Object* newInstance() const;
+#if LOG4CXX_ABI_VERSION <= 15
LogString toString() const;
+#endif
virtual LogString getName() const = 0;
static const Class& forName(const LogString& className);
static bool registerClass(const Class& newClass);