diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
| commit | 45add8a445d426959634e172f195c57c56c4ca3d (patch) | |
| tree | eef39567b46b94ae21723961c8ff1980db88dbaf /include/grpc++/alarm.h | |
| parent | 0160873273be3fb502f05d4349e074422f4addcb (diff) | |
| parent | 27b3f776da80da9d74e9c6a43d6794c86ba0cfb3 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into alarm_cpp
Diffstat (limited to 'include/grpc++/alarm.h')
| -rw-r--r-- | include/grpc++/alarm.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/grpc++/alarm.h b/include/grpc++/alarm.h index 59988b8732..3b8104d135 100644 --- a/include/grpc++/alarm.h +++ b/include/grpc++/alarm.h @@ -36,10 +36,11 @@ #ifndef GRPCXX_ALARM_H #define GRPCXX_ALARM_H +#include <grpc++/impl/codegen/completion_queue.h> #include <grpc++/impl/codegen/completion_queue_tag.h> #include <grpc++/impl/codegen/grpc_library.h> #include <grpc++/impl/codegen/time.h> -#include <grpc++/impl/codegen/completion_queue.h> +#include <grpc++/impl/grpc_library.h> #include <grpc/grpc.h> struct grpc_alarm; @@ -67,11 +68,11 @@ class Alarm : private GrpcLibrary { static_cast<void*>(&tag_))) {} /// Destroy the given completion queue alarm, cancelling it in the process. - ~Alarm(); + ~Alarm() { grpc_alarm_destroy(alarm_); } /// Cancel a completion queue alarm. Calling this function over an alarm that /// has already fired has no effect. - void Cancel(); + void Cancel() { grpc_alarm_cancel(alarm_); } private: class AlarmEntry : public CompletionQueueTag { |