Skip to content

Commit ed1ef7c

Browse files
committed
Apply google#397 to glog/logging.h.in
windows/glog/logging.h is expected to be generated by src/windows/preprocess.sh and should not be modified directly.
1 parent 1d98d00 commit ed1ef7c

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

src/glog/logging.h.in

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,14 +1147,9 @@ public:
11471147
// 2005 if you are deriving from a type in the Standard C++ Library"
11481148
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
11491149
// Let's just ignore the warning.
1150-
#ifdef _MSC_VER
1151-
# pragma warning(push)
1152-
# pragma warning(disable: 4275)
1153-
#endif
1150+
GLOG_MSVC_PUSH_DISABLE_WARNING(4275)
11541151
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
1155-
#ifdef _MSC_VER
1156-
# pragma warning(pop)
1157-
#endif
1152+
GLOG_MSVC_POP_WARNING()
11581153
public:
11591154
LogStream(char *buf, int len, int ctr)
11601155
: std::ostream(NULL),

src/windows/glog/logging.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,14 +1151,9 @@ class GOOGLE_GLOG_DLL_DECL LogMessage {
11511151
// 2005 if you are deriving from a type in the Standard C++ Library"
11521152
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
11531153
// Let's just ignore the warning.
1154-
#ifdef _MSC_VER
1155-
# pragma warning(push)
1156-
# pragma warning(disable: 4275)
1157-
#endif
1154+
GLOG_MSVC_PUSH_DISABLE_WARNING(4275)
11581155
class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
1159-
#ifdef _MSC_VER
1160-
# pragma warning(pop)
1161-
#endif
1156+
GLOG_MSVC_POP_WARNING()
11621157
public:
11631158
LogStream(char *buf, int len, int ctr)
11641159
: std::ostream(NULL),

0 commit comments

Comments
 (0)