Make C++ alarm class usable and testable - there were some build issues and

it was not actually even included in the library or the test suite.

1 files changed, 2 insertions, 2 deletions

diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_cpp_test.cc
index 09df6852a5..50fc9cd5dc 100644
--- a/test/cpp/common/alarm_test.cc
+++ b/test/cpp/common/alarm_cpp_test.cc
@@ -33,9 +33,9 @@
 
 #include <grpc++/alarm.h>
 #include <grpc++/completion_queue.h>
+#include <grpc++/impl/codegen/completion_queue_tag.h>
 #include <gtest/gtest.h>
 
-#include <grpc++/completion_queue.h>
 #include "test/core/util/test_config.h"
 
 namespace grpc {
@@ -45,7 +45,7 @@ class TestTag : public CompletionQueueTag {
  public:
   TestTag() : tag_(0) {}
   TestTag(intptr_t tag) : tag_(tag) {}
-  bool FinalizeResult(void** tag, bool* status) { return true; }
+  bool FinalizeResult(void** tag, bool* status) GRPC_OVERRIDE { return true; }
   intptr_t tag() { return tag_; }
 
  private: