diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-04 08:21:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-04 08:21:56 -0700 |
| commit | 32df467f1189c2b1bc7010b0a99932a7a3fb2684 (patch) | |
| tree | 106201276069914dcdcf2d9727047167486887a4 /src/cpp/util | |
| parent | 41fd9f2343ad39fc6db1b417ee403c976fc4b00f (diff) | |
| parent | 852c58e8ae64ccd7361ab0bdc36f3297960c9d5b (diff) | |
Merge github.com:grpc/grpc into grpc_slice
Diffstat (limited to 'src/cpp/util')
| -rw-r--r-- | src/cpp/util/time_cc.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/cpp/util/time_cc.cc b/src/cpp/util/time_cc.cc index c43d848cc6..cd59a19703 100644 --- a/src/cpp/util/time_cc.cc +++ b/src/cpp/util/time_cc.cc @@ -32,9 +32,6 @@ */ #include <grpc++/support/config.h> - -#ifndef GRPC_CXX0X_NO_CHRONO - #include <grpc++/support/time.h> #include <grpc/support/time.h> @@ -91,5 +88,3 @@ system_clock::time_point Timespec2Timepoint(gpr_timespec t) { } } // namespace grpc - -#endif // !GRPC_CXX0X_NO_CHRONO |