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

Merge pull request #254 from DariuszOstolski/issue253

Browse Source 
#253: Use MS preprocessor idiom to disable warning
This commit is contained in:
Shinichiro Hamaji 2017-10-20 15:48:21 +09:00 committed by GitHub
commit cb7b26bd71
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1148,11 +1148,12 @@ public:
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
// Let's just ignore the warning. // Let's just ignore the warning.
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4275) # pragma warning(disable: 4275)
#endif #endif
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(default: 4275) # pragma warning(pop)
#endif #endif
public: public:
LogStream(char *buf, int len, int ctr) LogStream(char *buf, int len, int ctr)