reorder params in Server
diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index 9c33b38..d0a357a 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -119,15 +119,15 @@
/// Server constructors. To be used by \a ServerBuilder only.
///
- /// \param sync_server_cqs The completion queues to use if the server is a
- /// synchronous server (or a hybrid server). The server polls for new RPCs on
- /// these queues
- ///
/// \param max_message_size Maximum message length that the channel can
/// receive.
///
/// \param args The channel args
///
+ /// \param sync_server_cqs The completion queues to use if the server is a
+ /// synchronous server (or a hybrid server). The server polls for new RPCs on
+ /// these queues
+ ///
/// \param min_pollers The minimum number of polling threads per server
/// completion queue (in param sync_server_cqs) to use for listening to
/// incoming requests (used only in case of sync server)
@@ -138,10 +138,10 @@
///
/// \param sync_cq_timeout_msec The timeout to use when calling AsyncNext() on
/// server completion queues passed via sync_server_cqs param.
- Server(std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
+ Server(int max_message_size, ChannelArguments* args,
+ std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
sync_server_cqs,
- int max_message_size, ChannelArguments* args, int min_pollers,
- int max_pollers, int sync_cq_timeout_msec);
+ int min_pollers, int max_pollers, int sync_cq_timeout_msec);
/// Register a service. This call does not take ownership of the service.
/// The service must exist for the lifetime of the Server instance.
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 7ab41ca..f4e7733 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -236,7 +236,7 @@
}
std::unique_ptr<Server> server(new Server(
- sync_server_cqs, max_receive_message_size_, &args,
+ max_receive_message_size_, &args, sync_server_cqs,
sync_server_settings_.min_pollers, sync_server_settings_.max_pollers,
sync_server_settings_.cq_timeout_msec));
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 3352aee..da7de13 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -352,10 +352,10 @@
static internal::GrpcLibraryInitializer g_gli_initializer;
Server::Server(
+ int max_receive_message_size, ChannelArguments* args,
std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
sync_server_cqs,
- int max_receive_message_size, ChannelArguments* args, int min_pollers,
- int max_pollers, int sync_cq_timeout_msec)
+ int min_pollers, int max_pollers, int sync_cq_timeout_msec)
: max_receive_message_size_(max_receive_message_size),
sync_server_cqs_(sync_server_cqs),
started_(false),