organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #746 from zmodem/fix_predict_macros2

Browse source 
Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
This commit is contained in:
Feng Xiao 2015-08-27 15:52:07 -07:00
commit 47210ccd77
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/google/protobuf/stubs/port.h
View file

@ -193,7 +193,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
// Provided at least since GCC 3.0.
#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
#else
#define GOOGLE_PREDICT_TRUE
#define GOOGLE_PREDICT_TRUE(x) (x)
#endif
#endif
@ -202,7 +202,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
// Provided at least since GCC 3.0.
#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#else
#define GOOGLE_PREDICT_FALSE
#define GOOGLE_PREDICT_FALSE(x) (x)
#endif
#endif