g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-04-21 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix merge error

Browse source
This commit is contained in:
Shawn Chain 2019-07-04 19:12:29 +08:00
parent b310efa1cd
commit 5f0c5993e1
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Common/Logger.cpp
View file

@ -87,9 +87,9 @@ void CLogger::DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogReco
struct tm* tm;
if (utc){
tm = ::gmtime(&timestamp);
tm = ::gmtime(&info.timestamp);
}else{
tm = ::localtime(&timestamp);
tm = ::localtime(&info.timestamp);
}
wxString message;
@ -133,8 +133,4 @@ void CLogger::writeLog(const wxChar* msg, time_t timestamp)
m_file->Write(wxString(msg));
m_file->Flush();
}
void CLogger::DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info) {
DoLog(level, msg.c_str(), info.timestamp);
}

2
Common/Logger.h
View file

@ -30,8 +30,6 @@ public:
virtual void DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info);
virtual void DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info);
private:
wxString m_name;
wxFFile* m_file;