Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE

Fixed bug in GOOGLE_PREDICT_FALSE.
10 years ago · f51f1b7bb6
parent dffd542bb8 f4c8627edb
commit f51f1b7bb6
1 changed files with 1 additions and 1 deletions
--- 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