diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 16:09:04 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 16:09:04 -0700 |
| commit | 8a03448a8c030d8a083e704061a5e89d9b9df01c (patch) | |
| tree | 1f21c7cf40d906783755864f87a49a5ae95c310e /include/grpc++/support/channel_arguments.h | |
| parent | 59743d6971a98562a1c59780a9f1e4bcc24dd899 (diff) | |
| parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) | |
Merge github.com:grpc/grpc into cleaner-posix2
Diffstat (limited to 'include/grpc++/support/channel_arguments.h')
| -rw-r--r-- | include/grpc++/support/channel_arguments.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index a9ede35f90..8c2f7c71eb 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -34,12 +34,12 @@ #ifndef GRPCXX_SUPPORT_CHANNEL_ARGUMENTS_H #define GRPCXX_SUPPORT_CHANNEL_ARGUMENTS_H -#include <vector> #include <list> +#include <vector> +#include <grpc++/support/config.h> #include <grpc/compression.h> #include <grpc/grpc.h> -#include <grpc++/support/config.h> namespace grpc { namespace testing { |