From 30862038340711e36a741ba166b7d198c3ad6b0a Mon Sep 17 00:00:00 2001 From: Nicolas Noble Date: Fri, 24 Apr 2015 18:17:45 -0700 Subject: Few VS2010 fixes. -) = delete isn't supported. Moving destructor out of scope. -) variadic templates aren't supported. Replacing emplace_back's construction. -) C++11's {} inline construction isn't supported. Adding temporary variables. -) std::list<> can't work on a non-declared class. Changing to a raw pointer. --- include/grpc++/server.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/grpc++/server.h b/include/grpc++/server.h index 0ae27e9e9f..c686474702 100644 --- a/include/grpc++/server.h +++ b/include/grpc++/server.h @@ -80,7 +80,6 @@ class Server GRPC_FINAL : public GrpcLibrary, // ServerBuilder use only Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned); - Server() = delete; // Register a service. This call does not take ownership of the service. // The service must exist for the lifetime of the Server instance. bool RegisterService(RpcService* service); @@ -118,7 +117,7 @@ class Server GRPC_FINAL : public GrpcLibrary, int num_running_cb_; grpc::condition_variable callback_cv_; - std::list sync_methods_; + std::list* sync_methods_; // Pointer to the c grpc server. grpc_server* const server_; @@ -126,6 +125,8 @@ class Server GRPC_FINAL : public GrpcLibrary, ThreadPoolInterface* thread_pool_; // Whether the thread pool is created and owned by the server. bool thread_pool_owned_; + private: + Server() : server_(NULL) { abort(); } }; } // namespace grpc -- cgit v1.2.3