diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-11-08 10:04:53 -0800 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-11-08 10:04:53 -0800 |
| commit | 4047e45275fd071911600fb0425d1ce757a2f77b (patch) | |
| tree | dc743f5a084ff9dd153814c251c639e3f6b4d899 /src/cpp/util | |
| parent | 0c1d8e2086b055b6e322e00e52223ec5359fca4b (diff) | |
| parent | 99dcb6953e3a01e2a2795ba3f09e6b6f64114d95 (diff) | |
Merge branch 'master' into resource-quota-fix
Diffstat (limited to 'src/cpp/util')
| -rw-r--r-- | src/cpp/util/time_cc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/util/time_cc.cc b/src/cpp/util/time_cc.cc index 1c658b0c15..3b6e075929 100644 --- a/src/cpp/util/time_cc.cc +++ b/src/cpp/util/time_cc.cc @@ -21,10 +21,10 @@ #include <grpc/support/time.h> using std::chrono::duration_cast; +using std::chrono::high_resolution_clock; using std::chrono::nanoseconds; using std::chrono::seconds; using std::chrono::system_clock; -using std::chrono::high_resolution_clock; namespace grpc { |