This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch gcc5_compilation_error in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit cc8f88a436030cb301c9f6fd134c735aee16a763 Author: Stephen Webb <[email protected]> AuthorDate: Mon Apr 3 17:12:26 2023 +1000 Prevent a compilation error when using gcc5 --- src/main/cpp/defaultconfigurator.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/cpp/defaultconfigurator.cpp b/src/main/cpp/defaultconfigurator.cpp index 5bb254bf..4c936a96 100644 --- a/src/main/cpp/defaultconfigurator.cpp +++ b/src/main/cpp/defaultconfigurator.cpp @@ -169,6 +169,7 @@ log4cxx::spi::ConfigurationStatus DefaultConfigurator::tryLoadFile(const LogStri std::tuple<log4cxx::spi::ConfigurationStatus,LogString> DefaultConfigurator::configureFromFile(const std::vector<LogString>& directories, const std::vector<LogString>& filenames){ + using ResultType = std::tuple<log4cxx::spi::ConfigurationStatus, LogString>; log4cxx::helpers::Pool pool; for( LogString dir : directories ){ @@ -183,14 +184,14 @@ DefaultConfigurator::configureFromFile(const std::vector<LogString>& directories { log4cxx::spi::ConfigurationStatus configStatus = tryLoadFile(canidate_str); if( configStatus == log4cxx::spi::ConfigurationStatus::Configured ){ - return {configStatus, canidate_str}; + return ResultType{configStatus, canidate_str}; } LogLog::debug(LOG4CXX_STR("Unable to load file: trying next")); } } } - return {log4cxx::spi::ConfigurationStatus::NotConfigured, LogString()}; + return ResultType{log4cxx::spi::ConfigurationStatus::NotConfigured, LogString()}; }
