From f4c8627edbc6ee823ec73003112f97b32403bd09 Mon Sep 17 00:00:00 2001 From: Austin Schuh Date: Fri, 5 Jun 2015 18:49:25 -0700 Subject: 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. --- src/google/protobuf/stubs/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google') diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 3acaeba1..e4c35a2f 100644 --- 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 -- cgit v1.2.3