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

Fix compilation error with -DNDEBUG.

Browse Source 
This bug is reported in
http://code.google.com/p/google-glog/issues/detail?id=19



git-svn-id: https://google-glog.googlecode.com/svn/trunk@74 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2009-11-11 09:07:47 +00:00
parent effef71e00
commit b71aa94381
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,7 +652,7 @@ DEFINE_CHECK_OP_IMPL(_GT, > )
// file is included). Save the current meaning now and use it // file is included). Save the current meaning now and use it
// in the macro. // in the macro.
typedef std::string _Check_string; typedef std::string _Check_string;
#define CHECK_OP_LOG(name, op, val1, val2, log) \ #define CHECK_OP_LOG(name, op, val1, val2, log) \
while (@ac_google_namespace@::_Check_string* _result = \ while (@ac_google_namespace@::_Check_string* _result = \
@ac_google_namespace@::Check##name##Impl( \ @ac_google_namespace@::Check##name##Impl( \
@ac_google_namespace@::GetReferenceableValue(val1), \ @ac_google_namespace@::GetReferenceableValue(val1), \
@ -663,11 +663,12 @@ typedef std::string _Check_string;
#else #else
// In optimized mode, use CheckOpString to hint to compiler that // In optimized mode, use CheckOpString to hint to compiler that
// the while condition is unlikely. // the while condition is unlikely.
#define CHECK_OP_LOG(name, op, val1, val2, log) \ #define CHECK_OP_LOG(name, op, val1, val2, log) \
while (@ac_google_namespace@::CheckOpString _result = \ while (@ac_google_namespace@::CheckOpString _result = \
@ac_google_namespace@::Check##name##Impl(GetReferenceableValue(val1), \ @ac_google_namespace@::Check##name##Impl( \
GetReferenceableValue(val2), \ @ac_google_namespace@::GetReferenceableValue(val1), \
#val1 " " #op " " #val2)) \ @ac_google_namespace@::GetReferenceableValue(val2), \
#val1 " " #op " " #val2)) \
log(__FILE__, __LINE__, _result).stream() log(__FILE__, __LINE__, _result).stream()
#endif // STATIC_ANALYSIS, !NDEBUG #endif // STATIC_ANALYSIS, !NDEBUG

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

@ -656,7 +656,7 @@ DEFINE_CHECK_OP_IMPL(_GT, > )
// file is included). Save the current meaning now and use it // file is included). Save the current meaning now and use it
// in the macro. // in the macro.
typedef std::string _Check_string; typedef std::string _Check_string;
#define CHECK_OP_LOG(name, op, val1, val2, log) \ #define CHECK_OP_LOG(name, op, val1, val2, log) \
while (google::_Check_string* _result = \ while (google::_Check_string* _result = \
google::Check##name##Impl( \ google::Check##name##Impl( \
google::GetReferenceableValue(val1), \ google::GetReferenceableValue(val1), \
@ -667,11 +667,12 @@ typedef std::string _Check_string;
#else #else
// In optimized mode, use CheckOpString to hint to compiler that // In optimized mode, use CheckOpString to hint to compiler that
// the while condition is unlikely. // the while condition is unlikely.
#define CHECK_OP_LOG(name, op, val1, val2, log) \ #define CHECK_OP_LOG(name, op, val1, val2, log) \
while (google::CheckOpString _result = \ while (google::CheckOpString _result = \
google::Check##name##Impl(GetReferenceableValue(val1), \ google::Check##name##Impl( \
GetReferenceableValue(val2), \ google::GetReferenceableValue(val1), \
#val1 " " #op " " #val2)) \ google::GetReferenceableValue(val2), \
#val1 " " #op " " #val2)) \
log(__FILE__, __LINE__, _result).stream() log(__FILE__, __LINE__, _result).stream()
#endif // STATIC_ANALYSIS, !NDEBUG #endif // STATIC_ANALYSIS, !NDEBUG