Merge branch 'master' of github.com:grpc/grpc into the-purge-2

Conflicts:
	include/grpc++/completion_queue.h

1 files changed, 3 insertions, 2 deletions

diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h
index ba390c96e9..5c2b1cce93 100644
--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@@ -36,6 +36,7 @@
 
 #include <grpc/support/time.h>
 #include <grpc++/impl/client_unary_call.h>
+#include <grpc++/impl/grpc_library.h>
 #include <grpc++/time.h>
 
 struct grpc_completion_queue;
@@ -71,11 +72,11 @@ class CompletionQueueTag {
 };
 
 // grpc_completion_queue wrapper class
-class CompletionQueue {
+class CompletionQueue : public GrpcLibrary {
  public:
   CompletionQueue();
   explicit CompletionQueue(grpc_completion_queue* take);
-  ~CompletionQueue();
+  ~CompletionQueue() GRPC_OVERRIDE;
 
   // Tri-state return for AsyncNext: SHUTDOWN, GOT_EVENT, TIMEOUT
   enum NextStatus { SHUTDOWN, GOT_EVENT, TIMEOUT };