diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-09-01 20:18:41 +0200 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-09-01 20:18:41 +0200 |
| commit | d3dee724370937503ebe05b9507c90feab2df602 (patch) | |
| tree | aa14d0ea23c7eaacb36503d53dc7f4eb707e3beb /src/cpp | |
| parent | 410208c25ce06aff6a0d5ac242dd5a37bfa140c3 (diff) | |
| parent | 1141aef9b772be26c002849180666944c933d70e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/server/server_builder.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 45bb858e2e..87a526fe98 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -35,10 +35,9 @@ #include <grpc++/impl/service_type.h> #include <grpc++/server.h> -#include <grpc/support/cpu.h> #include <grpc/support/log.h> +#include <grpc/support/useful.h> -#include "include/grpc/support/useful.h" #include "src/cpp/server/thread_pool_interface.h" namespace grpc { |