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

Apply #397 to glog/logging.h.in

Browse Source 
windows/glog/logging.h is expected to be generated by
src/windows/preprocess.sh and should not be modified directly.
This commit is contained in:
Shinichiro Hamaji 2019-01-24 09:25:43 +09:00
parent 1d98d00c7e
commit ed1ef7c4db
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1147,14 +1147,9 @@ public:
// 2005 if you are deriving from a type in the Standard C++ Library"
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
// Let's just ignore the warning.
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4275)
#endif
GLOG_MSVC_PUSH_DISABLE_WARNING(4275)
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
#ifdef _MSC_VER
# pragma warning(pop)
#endif
GLOG_MSVC_POP_WARNING()
public:
LogStream(char *buf, int len, int ctr)
: std::ostream(NULL),

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

@ -1151,14 +1151,9 @@ public:
// 2005 if you are deriving from a type in the Standard C++ Library"
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
// Let's just ignore the warning.
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4275)
#endif
GLOG_MSVC_PUSH_DISABLE_WARNING(4275)
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
#ifdef _MSC_VER
# pragma warning(pop)
#endif
GLOG_MSVC_POP_WARNING()
public:
LogStream(char *buf, int len, int ctr)
: std::ostream(NULL),