diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-26 13:20:46 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-26 13:20:46 -0700 |
| commit | 039021f5ef3ed5c2d3eef1f360f009ba873cf757 (patch) | |
| tree | d7516d4ff1474583df19c83d9209e844a924ef9f /src/cpp/client/client_context.cc | |
| parent | 90797b91a25ff7a0e0b76a26c76c88c9f3b9ada1 (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into we-are-never-ever-ever
Diffstat (limited to 'src/cpp/client/client_context.cc')
| -rw-r--r-- | src/cpp/client/client_context.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 73147fd7bb..db636a5456 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -33,13 +33,13 @@ #include <grpc++/client_context.h> +#include <grpc++/security/credentials.h> +#include <grpc++/server_context.h> +#include <grpc++/support/time.h> #include <grpc/compression.h> #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> -#include <grpc++/security/credentials.h> -#include <grpc++/server_context.h> -#include <grpc++/support/time.h> #include "src/core/channel/compress_filter.h" #include "src/cpp/common/create_auth_context.h" |