diff options
| author |  vjpai <vpai@google.com> | 2015-03-25 14:55:25 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-03-25 14:55:25 -0700 |
| commit | f731d68fefe35ea8630c472e453ad640e5043ede (patch) | |
| tree | 4a6b60d516f924a232c297afde98a754039f88df | |
| parent | 335b97df8c610e99befea20ef67ce2f8866eef24 (diff) | |
Avoid a problem when clang pretends to be GNUC
| -rw-r--r-- | include/grpc++/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/grpc++/config.h b/include/grpc++/config.h index e10f00fb63..8ef5d71bfa 100644 --- a/include/grpc++/config.h +++ b/include/grpc++/config.h @@ -65,11 +65,13 @@ ::google::protobuf::io::ZeroCopyInputStream #endif +#ifndef __clang__ #ifdef __GNUC__ #if (__GNUC__ * 100 + __GNUC_MINOR__ < 406) #define GRPC_NO_NULLPTR #endif #endif +#endif #ifdef GRPC_NO_NULLPTR #include <memory> |