diff options
author | David Garcia Quintas <dgq@google.com> | 2016-01-27 19:57:58 -0800 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-01-27 19:57:58 -0800 |
commit | b4e51b52bdd3a41f44e4959d08957f7142c9c56a (patch) | |
tree | 699df3ca4dfe307dc9e139dab565dc1db1a700fe /include/grpc++/impl | |
parent | 5a9462339dd35de13acd44e7c8a001ac727c038e (diff) | |
parent | f846aaf41baf34d68f9aa7e3daa2c65cd75dd7f1 (diff) |
Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces
Diffstat (limited to 'include/grpc++/impl')
-rw-r--r-- | include/grpc++/impl/codegen/client_context.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/grpc++/impl/codegen/client_context.h b/include/grpc++/impl/codegen/client_context.h index 9ac3e5bd79..db2afe930c 100644 --- a/include/grpc++/impl/codegen/client_context.h +++ b/include/grpc++/impl/codegen/client_context.h @@ -53,15 +53,15 @@ #include <memory> #include <string> -#include <grpc++/impl/codegen/sync.h> -#include <grpc++/impl/codegen/security/auth_context.h> #include <grpc++/impl/codegen/config.h> +#include <grpc++/impl/codegen/security/auth_context.h> #include <grpc++/impl/codegen/status.h> #include <grpc++/impl/codegen/string_ref.h> +#include <grpc++/impl/codegen/sync.h> #include <grpc++/impl/codegen/time.h> #include <grpc/impl/codegen/compression_types.h> -#include <grpc/impl/codegen/propagation_bits.h> #include <grpc/impl/codegen/log.h> +#include <grpc/impl/codegen/propagation_bits.h> #include <grpc/impl/codegen/time.h> struct census_context; @@ -288,6 +288,7 @@ class ClientContext { /// a client context is constructed and destructed. class GlobalCallbacks { public: + virtual ~GlobalCallbacks() {} virtual void DefaultConstructor(ClientContext* context) = 0; virtual void Destructor(ClientContext* context) = 0; }; |