Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE

Fixed bug in GOOGLE_PREDICT_FALSE.

Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE
Fixed bug in GOOGLE_PREDICT_FALSE.
f51f1b7b · Feng Xiao · dffd542b · f4c8627e · f51f1b7b
Commit f51f1b7b authored Jun 06, 2015 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.h src/google/protobuf/stubs/common.h +1 -1

No files found.
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -258,7 +258,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
 #ifndef GOOGLE_PREDICT_FALSE
 #ifdef __GNUC__
 // 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
 #define GOOGLE_PREDICT_FALSE
 #endif