luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminate msvc warnings

Browse Source
This commit is contained in:
Sergiu Deitsch 2021-12-09 10:55:06 +01:00 committed by Sergiu Deitsch
parent ccbda2dfd5
commit 52354b2adc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/windows.yml vendored
View File

@ -9,6 +9,9 @@ jobs:
defaults: defaults:
run: run:
shell: powershell shell: powershell
env:
CL: /MP
CXXFLAGS: /WX
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:

9
src/glog/logging.h.in
View File

@ -135,7 +135,7 @@ typedef unsigned __int64 uint64;
@ac_google_end_namespace@ @ac_google_end_namespace@
struct LogMessageTime { struct GOOGLE_GLOG_DLL_DECL LogMessageTime {
LogMessageTime(): time_struct_(), timestamp_(0), usecs_(0), gmtoffset_(0) {} LogMessageTime(): time_struct_(), timestamp_(0), usecs_(0), gmtoffset_(0) {}
void setTimeInfo(struct::tm time_struct, time_t timestamp, int32_t usecs){ void setTimeInfo(struct::tm time_struct, time_t timestamp, int32_t usecs){
@ -1940,7 +1940,14 @@ class GOOGLE_GLOG_DLL_DECL NullStreamFatal : public NullStream {
NullStreamFatal() { } NullStreamFatal() { }
NullStreamFatal(const char* file, int line, const CheckOpString& result) : NullStreamFatal(const char* file, int line, const CheckOpString& result) :
NullStream(file, line, result) { } NullStream(file, line, result) { }
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable : 4722)
#endif // _MSC_VER
@ac_cv___attribute___noreturn@ ~NullStreamFatal() throw () { _exit(1); } @ac_cv___attribute___noreturn@ ~NullStreamFatal() throw () { _exit(1); }
#if defined(_MSC_VER)
#pragma warning(pop)
#endif // _MSC_VER
}; };
// Install a signal handler that will dump signal information and a stack // Install a signal handler that will dump signal information and a stack