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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 1 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index d5e5df86f6..a285310847 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -854,7 +854,6 @@ src/cpp/client/create_channel_internal.cc \ 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 \ diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 6b70f091eb..0c7a6c7b5f 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -5041,7 +5041,6 @@ "src/cpp/client/secure_credentials.cc", "src/cpp/client/secure_credentials.h", "src/cpp/codegen/grpc_library.cc", - "src/cpp/common/alarm.cc", "src/cpp/common/auth_property_iterator.cc", "src/cpp/common/call.cc", "src/cpp/common/channel_arguments.cc", @@ -5300,7 +5299,6 @@ "src/cpp/client/generic_stub.cc", "src/cpp/client/insecure_credentials.cc", "src/cpp/codegen/grpc_library.cc", - "src/cpp/common/alarm.cc", "src/cpp/common/call.cc", "src/cpp/common/channel_arguments.cc", "src/cpp/common/completion_queue.cc", |