diff options
| author |  Vijay Pai <vpai@google.com> | 2016-02-25 14:46:14 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-02-25 14:46:14 -0800 |
| commit | 544b98fca3017843495e9f7846ec8d7e84066ca2 (patch) | |
| tree | 71ea17d74d8efd82a0ed0ef29dc220a2be82e5f4 /Makefile | |
| parent | c05865259bb662a4a777b5ba16b3ab6ed9964c51 (diff) | |
| parent | e2f243ba7c8e9492e8a638bf5ac4dc3c6048cf8d (diff) | |
Merge pull request #5293 from dgquintas/alarm_cpp
Made Alarm's constructor a template for deadline
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -2990,7 +2990,6 @@ LIBGRPC++_SRC = \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ src/cpp/client/insecure_credentials.cc \ - src/cpp/common/alarm.cc \ src/cpp/common/call.cc \ src/cpp/common/channel_arguments.cc \ src/cpp/common/completion_queue.cc \ @@ -3271,7 +3270,6 @@ LIBGRPC++_UNSECURE_SRC = \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ src/cpp/client/insecure_credentials.cc \ - src/cpp/common/alarm.cc \ src/cpp/common/call.cc \ src/cpp/common/channel_arguments.cc \ src/cpp/common/completion_queue.cc \ |