Skip to content

P
protobuf
Commit 47210ccd authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Merge pull request #746 from zmodem/fix_predict_macros2 

Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
parents 59b360f6 fcf1b575
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/google/protobuf/stubs/port.h
View file @ 47210ccd
...@@ -193,7 +193,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); ...@@ -193,7 +193,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
// Provided at least since GCC 3.0. // Provided at least since GCC 3.0.
#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) #define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
#else #else
#define GOOGLE_PREDICT_TRUE #define GOOGLE_PREDICT_TRUE(x) (x)
#endif #endif
#endif #endif
...@@ -202,7 +202,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); ...@@ -202,7 +202,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
// Provided at least since GCC 3.0. // Provided at least since GCC 3.0.
#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0)) #define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#else #else
#define GOOGLE_PREDICT_FALSE #define GOOGLE_PREDICT_FALSE(x) (x)
#endif #endif
#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