diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 12:43:02 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 12:43:02 -0700 |
| commit | 3bd96959398d0671fee3785d4b2aee6042649b15 (patch) | |
| tree | abc5288b8a4a95b3fb1d5a922bf3b1b75c5bddbc /src/cpp/server | |
| parent | c65ed870ed45522194c0fcb884c9098672ac35ba (diff) | |
| parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) | |
Merge github.com:grpc/grpc into idempotent
Diffstat (limited to 'src/cpp/server')
| -rw-r--r-- | src/cpp/server/server.cc | 2 | ||||
| -rw-r--r-- | src/cpp/server/server_builder.cc | 4 | ||||
| -rw-r--r-- | src/cpp/server/server_context.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 05c58ccc4f..5ec05e4dcc 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -49,7 +49,7 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -#include "src/core/profiling/timers.h" +#include "src/core/lib/profiling/timers.h" #include "src/cpp/server/thread_pool_interface.h" namespace grpc { diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 134e5f1d5f..1947d68e3e 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -33,10 +33,10 @@ #include <grpc++/server_builder.h> -#include <grpc/support/cpu.h> -#include <grpc/support/log.h> #include <grpc++/impl/service_type.h> #include <grpc++/server.h> +#include <grpc/support/cpu.h> +#include <grpc/support/log.h> #include "src/cpp/server/thread_pool_interface.h" namespace grpc { diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index 5d12ce2ecf..0422650953 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -42,8 +42,8 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -#include "src/core/channel/compress_filter.h" -#include "src/core/surface/call.h" +#include "src/core/lib/channel/compress_filter.h" +#include "src/core/lib/surface/call.h" #include "src/cpp/common/create_auth_context.h" namespace grpc { |