4 files changed, 20 insertions, 17 deletions
diff --git a/include/grpc++/channel.h b/include/grpc++/channel.h
index 7b54751ae3..f4035eee63 100644
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@@ -55,7 +55,7 @@ class Channel GRPC_FINAL : public ChannelInterface,
 
   /// Get the current channel state. If the channel is in IDLE and
   /// \a try_to_connect is set to true, try to connect.
-  grpc_connectivity_state GetState(bool try_to_connect) override;
+  grpc_connectivity_state GetState(bool try_to_connect) GRPC_OVERRIDE;
 
  private:
   template <class InputMessage, class OutputMessage>
@@ -68,15 +68,15 @@ class Channel GRPC_FINAL : public ChannelInterface,
   Channel(const grpc::string& host, grpc_channel* c_channel);
 
   Call CreateCall(const RpcMethod& method, ClientContext* context,
-                  CompletionQueue* cq) override;
-  void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) override;
-  void* RegisterMethod(const char* method) override;
+                  CompletionQueue* cq) GRPC_OVERRIDE;
+  void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) GRPC_OVERRIDE;
+  void* RegisterMethod(const char* method) GRPC_OVERRIDE;
 
   void NotifyOnStateChangeImpl(grpc_connectivity_state last_observed,
                                gpr_timespec deadline, CompletionQueue* cq,
-                               void* tag) override;
+                               void* tag) GRPC_OVERRIDE;
   bool WaitForStateChangeImpl(grpc_connectivity_state last_observed,
-                              gpr_timespec deadline) override;
+                              gpr_timespec deadline) GRPC_OVERRIDE;
 
   const grpc::string host_;
   grpc_channel* const c_channel_;  // owned
diff --git a/include/grpc++/impl/codegen/channel_interface.h b/include/grpc++/impl/codegen/channel_interface.h
index e29417396e..353f52cef9 100644
--- a/include/grpc++/impl/codegen/channel_interface.h
+++ b/include/grpc++/impl/codegen/channel_interface.h
@@ -63,6 +63,7 @@ class ClientAsyncResponseReader;
 /// Codegen interface for \a grpc::Channel.
 class ChannelInterface {
  public:
+  virtual ~ChannelInterface() {}
   /// Get the current channel state. If the channel is in IDLE and
   /// \a try_to_connect is set to true, try to connect.
   virtual grpc_connectivity_state GetState(bool try_to_connect) = 0;
diff --git a/include/grpc++/impl/codegen/server_interface.h b/include/grpc++/impl/codegen/server_interface.h
index 8f7ce7b501..99d177c03d 100644
--- a/include/grpc++/impl/codegen/server_interface.h
+++ b/include/grpc++/impl/codegen/server_interface.h
@@ -54,6 +54,8 @@ class ThreadPoolInterface;
 /// Servers are configured and started via \a grpc::ServerBuilder.
 class ServerInterface : public CallHook {
  public:
+  virtual ~ServerInterface() {}
+
   /// Shutdown the server, blocking until all rpc processing finishes.
   /// Forcefully terminate pending calls after \a deadline expires.
   ///
diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index 2c95bd8c31..ec36d524cd 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -73,7 +73,7 @@ class Server GRPC_FINAL : public ServerInterface,
   ///
   /// \warning The server must be either shutting down or some other thread must
   /// call \a Shutdown for this function to ever return.
-  void Wait() override;
+  void Wait() GRPC_OVERRIDE;
 
   /// Global Callbacks
   ///
@@ -116,16 +116,16 @@ class Server GRPC_FINAL : public ServerInterface,
 
   /// 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(const grpc::string* host, RpcService* service) override;
+  bool RegisterService(const grpc::string* host, RpcService* service) GRPC_OVERRIDE;
 
   /// Register an asynchronous service. This call does not take ownership of the
   /// service. The service must exist for the lifetime of the Server instance.
   bool RegisterAsyncService(const grpc::string* host,
-                            AsynchronousService* service) override;
+                            AsynchronousService* service) GRPC_OVERRIDE;
 
   /// Register a generic service. This call does not take ownership of the
   /// service. The service must exist for the lifetime of the Server instance.
-  void RegisterAsyncGenericService(AsyncGenericService* service) override;
+  void RegisterAsyncGenericService(AsyncGenericService* service) GRPC_OVERRIDE;
 
   /// Tries to bind \a server to the given \a addr.
   ///
@@ -138,7 +138,7 @@ class Server GRPC_FINAL : public ServerInterface,
   /// \return bound port number on sucess, 0 on failure.
   ///
   /// \warning It's an error to call this method on an already started server.
-  int AddListeningPort(const grpc::string& addr, ServerCredentials* creds) override;
+  int AddListeningPort(const grpc::string& addr, ServerCredentials* creds) GRPC_OVERRIDE;
 
   /// Start the server.
   ///
@@ -148,21 +148,21 @@ class Server GRPC_FINAL : public ServerInterface,
   /// \param num_cqs How many completion queues does \a cqs hold.
   ///
   /// \return true on a successful shutdown.
-  bool Start(ServerCompletionQueue** cqs, size_t num_cqs) override;
+  bool Start(ServerCompletionQueue** cqs, size_t num_cqs) GRPC_OVERRIDE;
 
   /// Process one or more incoming calls.
-  void RunRpc() override;
+  void RunRpc() GRPC_OVERRIDE;
 
   /// Schedule \a RunRpc to run in the threadpool.
-  void ScheduleCallback() override;
+  void ScheduleCallback() GRPC_OVERRIDE;
 
   void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) GRPC_OVERRIDE;
 
-  void ShutdownInternal(gpr_timespec deadline) override;
+  void ShutdownInternal(gpr_timespec deadline) GRPC_OVERRIDE;
 
-  int max_message_size() const override { return max_message_size_; };
+  int max_message_size() const GRPC_OVERRIDE { return max_message_size_; };
 
-  grpc_server* server() override { return server_; };
+  grpc_server* server() GRPC_OVERRIDE { return server_; };
 
   const int max_message_size_;