From 3297f04c13c17f4b98883b5dab3243eb708d9df5 Mon Sep 17 00:00:00 2001 From: Date: Fri, 25 Jan 2013 07:59:25 +0000 Subject: [PATCH] Remove warning of DCHECK_NOTNULL http://code.google.com/p/google-glog/issues/detail?id=87 git-svn-id: https://google-glog.googlecode.com/svn/trunk@127 eb4d4688-79bd-11dd-afb4-1d65580434c0 --- src/glog/logging.h.in | 2 +- src/windows/glog/logging.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index 6939e4b..f34dbe4 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -1037,7 +1037,7 @@ const LogSeverity GLOG_0 = GLOG_ERROR; while (false) \ GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) (val) +#define DCHECK_NOTNULL(val) (void)(val) #define DCHECK_STREQ(str1, str2) \ GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index ce7e646..05aba8c 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -1041,7 +1041,7 @@ const LogSeverity GLOG_0 = GLOG_ERROR; while (false) \ GLOG_MSVC_POP_WARNING() CHECK_GT(val1, val2) -#define DCHECK_NOTNULL(val) (val) +#define DCHECK_NOTNULL(val) (void)(val) #define DCHECK_STREQ(str1, str2) \ GLOG_MSVC_PUSH_DISABLE_WARNING(4127) \ -- 2.7.4