Browse Source

Merge remote-tracking branch 'github/master'

Conflicts:
	Log.cpp
	Log.h
pull/228/head
EinMByte 9 years ago
parent
commit
6f569f5334
  1. 6
      Log.cpp
  2. 4
      Log.h

6
Log.cpp

@ -24,8 +24,12 @@ void LogMsg::Process()
const std::string& Log::GetTimestamp () const std::string& Log::GetTimestamp ()
{ {
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) #if !defined(__APPLE__)
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__APPLE__)
auto ts = std::chrono::monotonic_clock::now (); auto ts = std::chrono::monotonic_clock::now ();
#else
auto ts = std::chrono::steady_clock::now ();
#endif
#else #else
auto ts = std::chrono::steady_clock::now (); auto ts = std::chrono::steady_clock::now ();
#endif #endif

4
Log.h

@ -50,11 +50,15 @@ class Log: public i2p::util::MsgQueue<LogMsg>
std::ostream * m_LogStream; std::ostream * m_LogStream;
std::string m_Timestamp; std::string m_Timestamp;
#if !defined(__APPLE__)
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) // gcc 4.6 #if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) // gcc 4.6
std::chrono::monotonic_clock::time_point m_LastTimestampUpdate; std::chrono::monotonic_clock::time_point m_LastTimestampUpdate;
#else #else
std::chrono::steady_clock::time_point m_LastTimestampUpdate; std::chrono::steady_clock::time_point m_LastTimestampUpdate;
#endif #endif
#else
std::chrono::steady_clock::time_point m_LastTimestampUpdate;
#endif
}; };
extern Log * g_Log; extern Log * g_Log;

Loading…
Cancel
Save