diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 07:35:37 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 07:35:37 -0700 |
| commit | abf03aed93e95c934143bcb986add21ed8ca239f (patch) | |
| tree | 4e290c0e0046ae8fd13a2c2fab46f5e69ab6dbf0 /include/grpc++/impl/codegen/time.h | |
| parent | 311e7badb80cceac466b57f03094844a2c289cf4 (diff) | |
| parent | d2f7268bc702d0bf2083b9dedb2ec07544b83dd2 (diff) | |
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
Diffstat (limited to 'include/grpc++/impl/codegen/time.h')
| -rw-r--r-- | include/grpc++/impl/codegen/time.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc++/impl/codegen/time.h b/include/grpc++/impl/codegen/time.h index d9b19bce64..87c5112d0d 100644 --- a/include/grpc++/impl/codegen/time.h +++ b/include/grpc++/impl/codegen/time.h @@ -35,7 +35,7 @@ #define GRPCXX_IMPL_CODEGEN_TIME_H #include <grpc++/impl/codegen/config.h> -#include <grpc/impl/codegen/time.h> +#include <grpc/impl/codegen/grpc_types.h> namespace grpc { @@ -79,7 +79,7 @@ class TimePoint<gpr_timespec> { #include <chrono> -#include <grpc/impl/codegen/time.h> +#include <grpc/impl/codegen/grpc_types.h> namespace grpc { |