Merge branch 'master' of https://github.com/PurpleI2P/i2pd

Destination.cpp

@@ -526,7 +526,7 @@ namespace client
     {
         if (!m_Pool || !IsReady ()) 
         {   
-            if (requestComplete) requestComplete (false);
+            if (requestComplete) requestComplete (nullptr);
             return false;
         }   
         m_Service.post (std::bind (&ClientDestination::RequestLeaseSet, this, dest, requestComplete));
@@ -630,7 +630,7 @@ namespace client
                 
                 if (done)
                 {
-                    if (it->second->requestComplete) it->second->requestComplete (false);
+                    if (it->second->requestComplete) it->second->requestComplete (nullptr);
                     delete it->second;
                     m_LeaseSetRequests.erase (it);
                 }   

Log.cpp

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

Log.h

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