diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2015-08-27 15:52:07 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-08-27 15:52:07 -0700 |
| commit | 47210ccd77c88becb9097d59b7765c2d2b41d68e (patch) | |
| tree | 846c9d984d88536cc6bcc2670e29e2f796fca274 /src/google/protobuf/stubs/port.h | |
| parent | 59b360f65124716900da74d5e801059907a0f806 (diff) | |
| parent | fcf1b575799f93d10d030069ba9857af924c31a8 (diff) | |
Merge pull request #746 from zmodem/fix_predict_macros2
Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}
Diffstat (limited to 'src/google/protobuf/stubs/port.h')
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index 6b94bc3a..74bdfffa 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -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 |