summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2017-08-09 07:35:05 (GMT)
committerGitHub <noreply@github.com>2017-08-09 07:35:05 (GMT)
commit246a5896f12e992188115bf2c7dbcc5242c61271 (patch)
tree3e352d47a9fb38ac7adb46d8f59c0d8ca3e7e4f6 /src
parente209906823b9144e955f9e01fedd90281c6d54c8 (diff)
parentdd19fb2466fb5c90369eb1387a9ba0689e7d0387 (diff)
downloadglog-246a5896f12e992188115bf2c7dbcc5242c61271.zip
glog-246a5896f12e992188115bf2c7dbcc5242c61271.tar.gz
glog-246a5896f12e992188115bf2c7dbcc5242c61271.tar.bz2
Merge pull request #225 from jray272/remove-log-every-n-assert
Fix LOG_EVERY_N with clang -Wunused-local-typedef
Diffstat (limited to 'src')
-rw-r--r--src/glog/logging.h.in6
-rwxr-xr-xsrc/windows/glog/logging.h6
2 files changed, 0 insertions, 12 deletions
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index 35c65be..7b04c1b 100644
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -934,13 +934,7 @@ struct CrashReason;
bool IsFailureSignalHandlerInstalled();
} // namespace glog_internal_namespace_
-#define GOOGLE_GLOG_COMPILE_ASSERT(expr, msg) \
- typedef @ac_google_namespace@::glog_internal_namespace_::CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
-
#define LOG_EVERY_N(severity, n) \
- GOOGLE_GLOG_COMPILE_ASSERT(@ac_google_namespace@::GLOG_ ## severity < \
- @ac_google_namespace@::NUM_SEVERITIES, \
- INVALID_REQUESTED_LOG_SEVERITY); \
SOME_KIND_OF_LOG_EVERY_N(severity, (n), @ac_google_namespace@::LogMessage::SendToLog)
#define SYSLOG_EVERY_N(severity, n) \
diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h
index e72c088..8d00675 100755
--- a/src/windows/glog/logging.h
+++ b/src/windows/glog/logging.h
@@ -938,13 +938,7 @@ struct CrashReason;
bool IsFailureSignalHandlerInstalled();
} // namespace glog_internal_namespace_
-#define GOOGLE_GLOG_COMPILE_ASSERT(expr, msg) \
- typedef google::glog_internal_namespace_::CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
-
#define LOG_EVERY_N(severity, n) \
- GOOGLE_GLOG_COMPILE_ASSERT(google::GLOG_ ## severity < \
- google::NUM_SEVERITIES, \
- INVALID_REQUESTED_LOG_SEVERITY); \
SOME_KIND_OF_LOG_EVERY_N(severity, (n), google::LogMessage::SendToLog)
#define SYSLOG_EVERY_N(severity, n) \