diff options
| -rw-r--r-- | include/grpcpp/impl/codegen/client_interceptor.h | 4 | ||||
| -rw-r--r-- | include/grpcpp/impl/codegen/interceptor.h | 2 | ||||
| -rw-r--r-- | src/cpp/client/channel_cc.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/grpcpp/impl/codegen/client_interceptor.h b/include/grpcpp/impl/codegen/client_interceptor.h index 23111b2c4b..f460c5ac0c 100644 --- a/include/grpcpp/impl/codegen/client_interceptor.h +++ b/include/grpcpp/impl/codegen/client_interceptor.h @@ -20,7 +20,6 @@ #define GRPCPP_IMPL_CODEGEN_CLIENT_INTERCEPTOR_H #include <grpcpp/impl/codegen/interceptor.h> -#include <string> namespace grpc { namespace experimental { @@ -41,4 +40,5 @@ class ClientInterceptorFactoryInterface { } // namespace experimental } // namespace grpc -#endif /* GRPCPP_IMPL_CODEGEN_CLIENT_INTERCEPTOR_H */ + +#endif // GRPCPP_IMPL_CODEGEN_CLIENT_INTERCEPTOR_H diff --git a/include/grpcpp/impl/codegen/interceptor.h b/include/grpcpp/impl/codegen/interceptor.h index 930183e981..6402a3a946 100644 --- a/include/grpcpp/impl/codegen/interceptor.h +++ b/include/grpcpp/impl/codegen/interceptor.h @@ -64,4 +64,4 @@ class InterceptorBatchMethods { } // namespace experimental } // namespace grpc -#endif /* GRPCPP_IMPL_CODEGEN_INTERCEPTOR_H */ +#endif // GRPCPP_IMPL_CODEGEN_INTERCEPTOR_H diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc index 00430d07db..7c7ecc8cb7 100644 --- a/src/cpp/client/channel_cc.cc +++ b/src/cpp/client/channel_cc.cc @@ -57,7 +57,9 @@ Channel::Channel( interceptor_creators) : host_(host), c_channel_(channel) { auto vector = interceptor_creators.release(); - interceptor_creators_ = std::move(*vector); + if (vector != nullptr) { + interceptor_creators_ = std::move(*vector); + } g_gli_initializer.summon(); } |