Commit f4c8627e authored by Austin Schuh's avatar Austin Schuh

Fixed bug in GOOGLE_PREDICT_FALSE.

The GOOGLE_PREDICT_FALSE macro is both incorrect, and doesn't match
the macro definition in glog, which causes conflicts when including
both libraries.  This commit fixes that by making it identical to
what is in glog.
parent 68975a4e
...@@ -258,7 +258,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); ...@@ -258,7 +258,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
#ifndef GOOGLE_PREDICT_FALSE #ifndef GOOGLE_PREDICT_FALSE
#ifdef __GNUC__ #ifdef __GNUC__
// Provided at least since GCC 3.0. // Provided at least since GCC 3.0.
#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(!!(x), 1)) #define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#else #else
#define GOOGLE_PREDICT_FALSE #define GOOGLE_PREDICT_FALSE
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment