diff options
| author |  Vijay Pai <vpai@google.com> | 2018-10-30 12:29:35 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-10-30 12:29:35 -0700 |
| commit | 47d0d5bf1f163e9dc03a771156aa712dc0716d2b (patch) | |
| tree | f2e0178f36785999a1697e80817a54b0d6dd77aa /src/cpp | |
| parent | 84e763f10a1e10d36c7de35970f9d25958ee2e16 (diff) | |
| parent | 53df56529bfb30214ece3ad5d90c07aa323d776b (diff) | |
Merge branch 'master' into server_callback
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/server/server_cc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 5d24e01a47..4ce2a46a09 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -620,7 +620,8 @@ Server::Server( std::vector< std::unique_ptr<experimental::ServerInterceptorFactoryInterface>> interceptor_creators) - : max_receive_message_size_(max_receive_message_size), + : interceptor_creators_(std::move(interceptor_creators)), + max_receive_message_size_(max_receive_message_size), sync_server_cqs_(std::move(sync_server_cqs)), started_(false), shutdown_(false), @@ -628,8 +629,7 @@ Server::Server( has_generic_service_(false), server_(nullptr), server_initializer_(new ServerInitializer(this)), - health_check_service_disabled_(false), - interceptor_creators_(std::move(interceptor_creators)) { + health_check_service_disabled_(false) { g_gli_initializer.summon(); gpr_once_init(&g_once_init_callbacks, InitGlobalCallbacks); global_callbacks_ = g_callbacks; |