|
|
@ -552,7 +552,7 @@ typedef std::ostream ostream_t;
|
|
|
|
typedef unsigned int EnumType;
|
|
|
|
typedef unsigned int EnumType;
|
|
|
|
typedef unsigned short VerboseLevel;
|
|
|
|
typedef unsigned short VerboseLevel;
|
|
|
|
typedef unsigned long int LineNumber;
|
|
|
|
typedef unsigned long int LineNumber;
|
|
|
|
typedef std::shared_ptr<base::Storage> StoragePointer;
|
|
|
|
typedef base::Storage *StoragePointer;
|
|
|
|
typedef std::shared_ptr<LogDispatchCallback> LogDispatchCallbackPtr;
|
|
|
|
typedef std::shared_ptr<LogDispatchCallback> LogDispatchCallbackPtr;
|
|
|
|
typedef std::shared_ptr<PerformanceTrackingCallback> PerformanceTrackingCallbackPtr;
|
|
|
|
typedef std::shared_ptr<PerformanceTrackingCallback> PerformanceTrackingCallbackPtr;
|
|
|
|
typedef std::shared_ptr<LoggerRegistrationCallback> LoggerRegistrationCallbackPtr;
|
|
|
|
typedef std::shared_ptr<LoggerRegistrationCallback> LoggerRegistrationCallbackPtr;
|
|
|
@ -2734,7 +2734,7 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
|
|
|
|
return it->second;
|
|
|
|
return it->second;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static el::base::type::StoragePointer getELPP();
|
|
|
|
static el::base::type::StoragePointer &getELPP();
|
|
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
private:
|
|
|
|
base::RegisteredHitCounters* m_registeredHitCounters;
|
|
|
|
base::RegisteredHitCounters* m_registeredHitCounters;
|
|
|
@ -4613,9 +4613,10 @@ el::base::debug::CrashHandler elCrashHandler(ELPP_USE_DEF_CRASH_HANDLER); \
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if ELPP_ASYNC_LOGGING
|
|
|
|
#if ELPP_ASYNC_LOGGING
|
|
|
|
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
|
|
|
|
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder()),\
|
|
|
|
|
|
|
|
new el::base::AsyncDispatchWorker()))
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
|
|
|
|
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder())))
|
|
|
|
#endif // ELPP_ASYNC_LOGGING
|
|
|
|
#endif // ELPP_ASYNC_LOGGING
|
|
|
|
#define INITIALIZE_NULL_EASYLOGGINGPP \
|
|
|
|
#define INITIALIZE_NULL_EASYLOGGINGPP \
|
|
|
|
namespace el {\
|
|
|
|
namespace el {\
|
|
|
|