diff options
| author |  vjpai <vpai@google.com> | 2015-06-04 09:51:28 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-06-04 09:51:28 -0700 |
| commit | ca61f5b765950dd2abfe8b2eae1d2e629f1d50c7 (patch) | |
| tree | 2c21cd2301fb3acfcac45ec02bdb4ebf9d3dde66 /Makefile | |
| parent | 8eedd4a2c69e377d30f5466b985df9159cc48851 (diff) | |
| parent | 491a67bc473655a960aed482787b1bcc2a773bba (diff) | |
Merge branch 'master' into poisson
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2839,6 +2839,7 @@ PUBLIC_HEADERS_C += \ include/grpc/support/port_platform.h \ include/grpc/support/slice.h \ include/grpc/support/slice_buffer.h \ + include/grpc/support/string_util.h \ include/grpc/support/subprocess.h \ include/grpc/support/sync.h \ include/grpc/support/sync_generic.h \ @@ -3332,6 +3333,7 @@ LIBGRPC++_SRC = \ src/cpp/common/rpc_method.cc \ src/cpp/proto/proto_utils.cc \ src/cpp/server/async_generic_service.cc \ + src/cpp/server/create_default_thread_pool.cc \ src/cpp/server/insecure_server_credentials.cc \ src/cpp/server/server.cc \ src/cpp/server/server_builder.cc \ @@ -3619,6 +3621,7 @@ LIBGRPC++_UNSECURE_SRC = \ src/cpp/common/rpc_method.cc \ src/cpp/proto/proto_utils.cc \ src/cpp/server/async_generic_service.cc \ + src/cpp/server/create_default_thread_pool.cc \ src/cpp/server/insecure_server_credentials.cc \ src/cpp/server/server.cc \ src/cpp/server/server_builder.cc \ |