Infinitelifetime

.gitignore

@@ -32,3 +32,5 @@ src/test/cpp/Testing/
 src/test/resources/org/
 src/test/resources/output/
 target/
+
+*.user

src/main/cpp/aprinitializer.cpp

@@ -118,8 +118,8 @@ void APRInitializer::unregisterAll()
 
 APRInitializer& APRInitializer::getInstance()
 {
-	static apr_environment env;
-	static APRInitializer init;
+	static WideLife<apr_environment> env;
+	static WideLife<APRInitializer> init;
 	return init;
 }
 

src/main/cpp/basicconfigurator.cpp

@@ -20,6 +20,7 @@
 #include <log4cxx/consoleappender.h>
 #include <log4cxx/logmanager.h>
 #include <log4cxx/logger.h>
+#include <log4cxx/helpers/widelife.h>
 
 using namespace log4cxx;
 
@@ -29,7 +30,7 @@ void BasicConfigurator::configure(const LayoutPtr& layoutArg)
 	auto layout = layoutArg;
 	if (!layout)
 	{
-		static const LogString TTCC_CONVERSION_PATTERN(LOG4CXX_STR("%r [%t] %p %c %x - %m%n"));
+		static const helpers::WideLife<LogString> TTCC_CONVERSION_PATTERN(LOG4CXX_STR("%r [%t] %p %c %x - %m%n"));
 		layout = std::make_shared<PatternLayout>(TTCC_CONVERSION_PATTERN);
 	}
 	auto appender = std::make_shared<ConsoleAppender>(layout);

src/main/cpp/charsetdecoder.cpp

@@ -512,14 +512,14 @@ CharsetDecoder* CharsetDecoder::createDefaultDecoder()
 
 CharsetDecoderPtr CharsetDecoder::getDefaultDecoder()
 {
-	static CharsetDecoderPtr decoder(createDefaultDecoder());
+	static WideLife<CharsetDecoderPtr> decoder(createDefaultDecoder());
 
 	//
 	//  if invoked after static variable destruction
 	//     (if logging is called in the destructor of a static object)
 	//     then create a new decoder.
 	//
-	if (decoder == 0)
+	if (decoder.value() == 0)
 	{
 		return CharsetDecoderPtr( createDefaultDecoder() );
 	}
@@ -529,14 +529,14 @@ CharsetDecoderPtr CharsetDecoder::getDefaultDecoder()
 
 CharsetDecoderPtr CharsetDecoder::getUTF8Decoder()
 {
-	static CharsetDecoderPtr decoder(new UTF8CharsetDecoder());
+	static WideLife<CharsetDecoderPtr> decoder(new UTF8CharsetDecoder());
 
 	//
 	//  if invoked after static variable destruction
 	//     (if logging is called in the destructor of a static object)
 	//     then create a new decoder.
 	//
-	if (decoder == 0)
+	if (decoder.value() == 0)
 	{
 		return std::make_shared<UTF8CharsetDecoder>();
 	}

src/main/cpp/charsetencoder.cpp

@@ -513,14 +513,14 @@ CharsetEncoder::~CharsetEncoder()
 
 CharsetEncoderPtr CharsetEncoder::getDefaultEncoder()
 {
-	static CharsetEncoderPtr encoder(createDefaultEncoder());
+	static WideLife<CharsetEncoderPtr> encoder(createDefaultEncoder());
 
 	//
 	//  if invoked after static variable destruction
 	//     (if logging is called in the destructor of a static object)
 	//     then create a new decoder.
 	//
-	if (encoder == 0)
+	if (encoder.value() == 0)
 	{
 		return CharsetEncoderPtr( createDefaultEncoder() );
 	}

src/main/cpp/class.cpp

@@ -105,7 +105,7 @@ Object* Class::newInstance() const
 
 Class::ClassMap& Class::getRegistry()
 {
-	static ClassMap registry;
+	static WideLife<ClassMap> registry;
 	return registry;
 }
 

src/main/cpp/classnamepatternconverter.cpp

@@ -39,7 +39,7 @@ PatternConverterPtr ClassNamePatternConverter::newInstance(
 {
 	if (options.size() == 0)
 	{
-		static PatternConverterPtr def = std::make_shared<ClassNamePatternConverter>(options);
+		static WideLife<PatternConverterPtr> def = std::make_shared<ClassNamePatternConverter>(options);
 		return def;
 	}
 

src/main/cpp/colorendpatternconverter.cpp

@@ -37,7 +37,7 @@ ColorEndPatternConverter::ColorEndPatternConverter() :
 PatternConverterPtr ColorEndPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<ColorEndPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<ColorEndPatternConverter>();
 	return instance;
 }
 

src/main/cpp/colorstartpatternconverter.cpp

@@ -154,7 +154,7 @@ ColorStartPatternConverter::ColorStartPatternConverter() :
 PatternConverterPtr ColorStartPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<ColorStartPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<ColorStartPatternConverter>();
 	return instance;
 }
 

src/main/cpp/consoleappender.cpp

@@ -70,13 +70,13 @@ ConsoleAppender::~ConsoleAppender()
 
 const LogString& ConsoleAppender::getSystemOut()
 {
-	static const LogString name(LOG4CXX_STR("System.out"));
+	static const WideLife<LogString> name(LOG4CXX_STR("System.out"));
 	return name;
 }
 
 const LogString& ConsoleAppender::getSystemErr()
 {
-	static const LogString name(LOG4CXX_STR("System.err"));
+	static const WideLife<LogString> name(LOG4CXX_STR("System.err"));
 	return name;
 }
 

src/main/cpp/defaultconfigurator.cpp

@@ -136,8 +136,8 @@ const LogString DefaultConfigurator::getConfiguratorClass()
 
 const LogString DefaultConfigurator::getConfigurationFileName()
 {
-	static const LogString LOG4CXX_DEFAULT_CONFIGURATION_KEY(LOG4CXX_STR("LOG4CXX_CONFIGURATION"));
-	static const LogString LOG4J_DEFAULT_CONFIGURATION_KEY(LOG4CXX_STR("log4j.configuration"));
+	static const WideLife<LogString> LOG4CXX_DEFAULT_CONFIGURATION_KEY(LOG4CXX_STR("LOG4CXX_CONFIGURATION"));
+	static const WideLife<LogString> LOG4J_DEFAULT_CONFIGURATION_KEY(LOG4CXX_STR("log4j.configuration"));
 	const LogString log4jConfigurationFileName(
 		OptionConverter::getSystemProperty(LOG4J_DEFAULT_CONFIGURATION_KEY, LOG4CXX_STR("")));
 	const LogString configurationFileName(
@@ -149,7 +149,7 @@ const LogString DefaultConfigurator::getConfigurationFileName()
 
 int DefaultConfigurator::getConfigurationWatchDelay()
 {
-	static const LogString LOG4CXX_DEFAULT_CONFIGURATION_WATCH_KEY(LOG4CXX_STR("LOG4CXX_CONFIGURATION_WATCH_SECONDS"));
+	static const WideLife<LogString> LOG4CXX_DEFAULT_CONFIGURATION_WATCH_KEY(LOG4CXX_STR("LOG4CXX_CONFIGURATION_WATCH_SECONDS"));
 	LogString optionStr = OptionConverter::getSystemProperty(LOG4CXX_DEFAULT_CONFIGURATION_WATCH_KEY, LogString());
 	int milliseconds = 0;
 	if (!optionStr.empty())

src/main/cpp/domconfigurator.cpp

@@ -1037,12 +1037,12 @@ void DOMConfigurator::parse(
 
 	LogString debugAttrib = subst(getAttribute(utf8Decoder, element, INTERNAL_DEBUG_ATTR));
 
-	static const LogString NULL_STRING(LOG4CXX_STR("NULL"));
+	static const WideLife<LogString> NULL_STRING(LOG4CXX_STR("NULL"));
 	LogLog::debug(LOG4CXX_STR("debug attribute= \"") + debugAttrib + LOG4CXX_STR("\"."));
 
 	// if the log4j.dtd is not specified in the XML file, then the
 	// "debug" attribute is returned as the empty string.
-	if (!debugAttrib.empty() && debugAttrib != NULL_STRING)
+	if (!debugAttrib.empty() && debugAttrib != NULL_STRING.value())
 	{
 		LogLog::setInternalDebugging(OptionConverter::toBoolean(debugAttrib, true));
 	}
@@ -1054,7 +1054,7 @@ void DOMConfigurator::parse(
 
 	LogString confDebug = subst(getAttribute(utf8Decoder, element, CONFIG_DEBUG_ATTR));
 
-	if (!confDebug.empty() && confDebug != NULL_STRING)
+	if (!confDebug.empty() && confDebug != NULL_STRING.value())
 	{
 		LogLog::warn(LOG4CXX_STR("The \"configDebug\" attribute is deprecated."));
 		LogLog::warn(LOG4CXX_STR("Use the \"internalDebug\" attribute instead."));
@@ -1064,14 +1064,14 @@ void DOMConfigurator::parse(
 	LogString thresholdStr = subst(getAttribute(utf8Decoder, element, THRESHOLD_ATTR));
 	LogLog::debug(LOG4CXX_STR("Threshold =\"") + thresholdStr + LOG4CXX_STR("\"."));
 
-	if (!thresholdStr.empty() && thresholdStr != NULL_STRING)
+	if (!thresholdStr.empty() && thresholdStr != NULL_STRING.value())
 	{
 		m_priv->repository->setThreshold(thresholdStr);
 	}
 
 	LogString threadSignalValue = subst(getAttribute(utf8Decoder, element, THREAD_CONFIG_ATTR));
 
-	if ( !threadSignalValue.empty() && threadSignalValue != NULL_STRING )
+	if ( !threadSignalValue.empty() && threadSignalValue != NULL_STRING.value() )
 	{
 		if ( threadSignalValue == LOG4CXX_STR("NoConfiguration") )
 		{

src/main/cpp/filelocationpatternconverter.cpp

@@ -35,7 +35,7 @@ FileLocationPatternConverter::FileLocationPatternConverter() :
 PatternConverterPtr FileLocationPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */ )
 {
-	static PatternConverterPtr instance = std::make_shared<FileLocationPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<FileLocationPatternConverter>();
 	return instance;
 }
 

src/main/cpp/formattinginfo.cpp

@@ -67,7 +67,7 @@ FormattingInfo::~FormattingInfo() {}
  */
 FormattingInfoPtr FormattingInfo::getDefault()
 {
-	static FormattingInfoPtr def= std::make_shared<FormattingInfo>(false, 0, INT_MAX);
+	static helpers::WideLife<FormattingInfoPtr> def= std::make_shared<FormattingInfo>(false, 0, INT_MAX);
 	return def;
 }
 

src/main/cpp/fulllocationpatternconverter.cpp

@@ -37,7 +37,7 @@ FullLocationPatternConverter::FullLocationPatternConverter() :
 PatternConverterPtr FullLocationPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<FullLocationPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<FullLocationPatternConverter>();
 	return instance;
 }
 

src/main/cpp/hierarchy.cpp

@@ -241,7 +241,7 @@ LevelPtr Hierarchy::getThreshold() const
 
 LoggerPtr Hierarchy::getLogger(const LogString& name)
 {
-	static spi::LoggerFactoryPtr defaultFactory = std::make_shared<DefaultLoggerFactory>();
+	static WideLife<spi::LoggerFactoryPtr> defaultFactory = std::make_shared<DefaultLoggerFactory>();
 	return getLogger(name, defaultFactory);
 }
 

src/main/cpp/integerpatternconverter.cpp

@@ -35,7 +35,7 @@ IntegerPatternConverter::IntegerPatternConverter() :
 PatternConverterPtr IntegerPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<IntegerPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<IntegerPatternConverter>();
 	return instance;
 }
 

src/main/cpp/level.cpp

@@ -32,50 +32,50 @@ IMPLEMENT_LOG4CXX_OBJECT_WITH_CUSTOM_CLASS(Level, LevelClass)
 
 LevelPtr Level::getOff()
 {
-	static LevelPtr offLevel = std::make_shared<Level>(Level::OFF_INT, LOG4CXX_STR("OFF"), 0);
+	static WideLife<LevelPtr> offLevel = std::make_shared<Level>(Level::OFF_INT, LOG4CXX_STR("OFF"), 0);
 	return offLevel;
 }
 
 LevelPtr Level::getFatal()
 {
-	static LevelPtr fatalLevel = std::make_shared<Level>(Level::FATAL_INT, LOG4CXX_STR("FATAL"), 0);
+	static WideLife<LevelPtr> fatalLevel = std::make_shared<Level>(Level::FATAL_INT, LOG4CXX_STR("FATAL"), 0);
 	return fatalLevel;
 }
 
 LevelPtr Level::getError()
 {
-	static LevelPtr errorLevel = std::make_shared<Level>(Level::ERROR_INT, LOG4CXX_STR("ERROR"), 3);
+	static WideLife<LevelPtr> errorLevel = std::make_shared<Level>(Level::ERROR_INT, LOG4CXX_STR("ERROR"), 3);
 	return errorLevel;
 }
 
 LevelPtr Level::getWarn()
 {
-	static LevelPtr warnLevel = std::make_shared<Level>(Level::WARN_INT, LOG4CXX_STR("WARN"), 4);
+	static WideLife<LevelPtr> warnLevel = std::make_shared<Level>(Level::WARN_INT, LOG4CXX_STR("WARN"), 4);
 	return warnLevel;
 }
 
 LevelPtr Level::getInfo()
 {
-	static LevelPtr infoLevel = std::make_shared<Level>(Level::INFO_INT, LOG4CXX_STR("INFO"), 6);
+	static WideLife<LevelPtr> infoLevel = std::make_shared<Level>(Level::INFO_INT, LOG4CXX_STR("INFO"), 6);
 	return infoLevel;
 }
 
 LevelPtr Level::getDebug()
 {
-	static LevelPtr debugLevel = std::make_shared<Level>(Level::DEBUG_INT, LOG4CXX_STR("DEBUG"), 7);
+	static WideLife<LevelPtr> debugLevel = std::make_shared<Level>(Level::DEBUG_INT, LOG4CXX_STR("DEBUG"), 7);
 	return debugLevel;
 }
 
 LevelPtr Level::getTrace()
 {
-	static LevelPtr traceLevel = std::make_shared<Level>(Level::TRACE_INT, LOG4CXX_STR("TRACE"), 7);
+	static WideLife<LevelPtr> traceLevel = std::make_shared<Level>(Level::TRACE_INT, LOG4CXX_STR("TRACE"), 7);
 	return traceLevel;
 }
 
 
 LevelPtr Level::getAll()
 {
-	static LevelPtr allLevel = std::make_shared<Level>(Level::ALL_INT, LOG4CXX_STR("ALL"), 7);
+	static WideLife<LevelPtr> allLevel = std::make_shared<Level>(Level::ALL_INT, LOG4CXX_STR("ALL"), 7);
 	return allLevel;
 }
 

src/main/cpp/levelpatternconverter.cpp

@@ -38,7 +38,7 @@ LevelPatternConverter::LevelPatternConverter() :
 PatternConverterPtr LevelPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr def = std::make_shared<LevelPatternConverter>();
+	static WideLife<PatternConverterPtr> def = std::make_shared<LevelPatternConverter>();
 	return def;
 }
 

src/main/cpp/linelocationpatternconverter.cpp

@@ -37,7 +37,7 @@ LineLocationPatternConverter::LineLocationPatternConverter() :
 PatternConverterPtr LineLocationPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<LineLocationPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<LineLocationPatternConverter>();
 	return instance;
 }
 

src/main/cpp/lineseparatorpatternconverter.cpp

@@ -36,7 +36,7 @@ LineSeparatorPatternConverter::LineSeparatorPatternConverter() :
 PatternConverterPtr LineSeparatorPatternConverter::newInstance(
 	const std::vector<LogString>& /* options */)
 {
-	static PatternConverterPtr instance = std::make_shared<LineSeparatorPatternConverter>();
+	static WideLife<PatternConverterPtr> instance = std::make_shared<LineSeparatorPatternConverter>();
 	return instance;
 }
 

src/main/cpp/literalpatternconverter.cpp

@@ -53,7 +53,7 @@ PatternConverterPtr LiteralPatternConverter::newInstance(
 {
 	if (literal.length() == 1 && literal[0] == 0x20 /* ' ' */)
 	{
-		static PatternConverterPtr blank = std::make_shared<LiteralPatternConverter>(literal);
+		static WideLife<PatternConverterPtr> blank = std::make_shared<LiteralPatternConverter>(literal);
 		return blank;
 	}
 

src/main/cpp/locationinfo.cpp

@@ -17,6 +17,7 @@
 
 #include <log4cxx/spi/location/locationinfo.h>
 #include <log4cxx/helpers/pool.h>
+#include <log4cxx/helpers/widelife.h>
 
 using namespace ::log4cxx::spi;
 using namespace log4cxx::helpers;
@@ -30,7 +31,7 @@ const char* const LocationInfo::NA_METHOD = "?::?";
 
 const LocationInfo& LocationInfo::getLocationUnavailable()
 {
-	static const LocationInfo unavailable;
+	static const WideLife<LocationInfo> unavailable;
 	return unavailable;
 }
 

src/main/cpp/loggerpatternconverter.cpp

@@ -39,7 +39,7 @@ PatternConverterPtr LoggerPatternConverter::newInstance(
 {
 	if (options.size() == 0)
 	{
-		static PatternConverterPtr def = std::make_shared<LoggerPatternConverter>(options);
+		static WideLife<PatternConverterPtr> def = std::make_shared<LoggerPatternConverter>(options);
 		return def;
 	}
 

src/main/cpp/loggingevent.cpp

@@ -354,8 +354,8 @@ const LogString& LoggingEvent::getCurrentThreadName()
 	thread_local LogString thread_id_string;
 #else
 	using ListItem = std::pair<ThreadIdType, LogString>;
-	static std::list<ListItem> thread_id_map;
-	static std::mutex mutex;
+	static WideLife<std::list<ListItem>> thread_id_map;
+	static WideLife<std::mutex> mutex;
 	std::lock_guard<std::mutex> lock(mutex);
 	auto pThreadId = std::find_if(thread_id_map.begin(), thread_id_map.end()
 		, [threadId](const ListItem& item) { return threadId == item.first; });
@@ -392,7 +392,7 @@ const LogString& LoggingEvent::getCurrentThreadUserName()
 #if LOG4CXX_HAS_THREAD_LOCAL
 	thread_local LogString thread_name;
 #else
-	static LogString thread_name = LOG4CXX_STR("(noname)");
+	static WideLife<LogString> thread_name = LOG4CXX_STR("(noname)");
 #endif
 	if( !thread_name.empty() ){
 		return thread_name;

src/main/cpp/loglog.cpp

@@ -56,7 +56,7 @@ LogLog::~LogLog(){}
 
 LogLog& LogLog::getInstance()
 {
-	static LogLog internalLogger;
+	static WideLife<LogLog> internalLogger;
 
 	return internalLogger;
 }