[logging-log4cxx] branch next_stable updated: Prevent compilation error when log4cxx::logchar is not char

[swebb2066]

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

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


The following commit(s) were added to refs/heads/next_stable by this push:
     new f17e0cc8 Prevent compilation error when log4cxx::logchar is not char
     new 44d18ab4 Merge branch 'next_stable' of 
https://github.com/apache/logging-log4cxx into next_stable
f17e0cc8 is described below

commit f17e0cc89b34fb911bbb9bb02266b6487a36cb47
Author: Stephen Webb <stephen.w...@sabreautonomous.com.au>
AuthorDate: Mon Sep 26 18:19:33 2022 +1000

    Prevent compilation error when log4cxx::logchar is not char
---
 src/main/cpp/defaultconfigurator.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/cpp/defaultconfigurator.cpp 
b/src/main/cpp/defaultconfigurator.cpp
index 97a594bf..eb6c26a8 100644
--- a/src/main/cpp/defaultconfigurator.cpp
+++ b/src/main/cpp/defaultconfigurator.cpp
@@ -21,6 +21,7 @@
 #include <log4cxx/file.h>
 #include <log4cxx/helpers/loglog.h>
 #include <log4cxx/helpers/optionconverter.h>
+#include <log4cxx/helpers/stringhelper.h>
 
 
 using namespace log4cxx;
@@ -120,7 +121,7 @@ int DefaultConfigurator::getConfigurationWatchDelay()
        LogString optionStr = 
OptionConverter::getSystemProperty(LOG4CXX_DEFAULT_CONFIGURATION_WATCH_KEY, 
LogString());
        int milliseconds = 0;
        if (!optionStr.empty())
-               milliseconds = stoi(optionStr) * 1000;
+               milliseconds = StringHelper::toInt(optionStr) * 1000;
        return milliseconds;
 }