Archives/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2024-11-04 06:00:37 +00:00
Code Issues Projects Releases Wiki Activity

Build with clang on linux fixed

Browse Source
This commit is contained in:
Cyril Lashkevich 2015-07-27 22:31:25 +03:00
parent 3f3103572a
commit 25b8a18224
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Destination.cpp
View File

@ -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);
}

6
Log.cpp
View File

@ -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

6
Log.h
View File

@ -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;