diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-12 10:13:52 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-12 10:13:52 -0800 |
| commit | a7d41147ea62b185cbf45ae5b38da9fbf84395cf (patch) | |
| tree | ac1aef0efd4b668ad9b0eb9b211394a2188e83ff /test/cpp/util/time_test.cc | |
| parent | 6f87164f3c3bfd918a5bf571e2da6ec73cb9ea57 (diff) | |
| parent | bf53a74b3f626c38aa65dd01d2f3d321b53c1fbe (diff) | |
Merge github.com:grpc/grpc into bad_metadata
Diffstat (limited to 'test/cpp/util/time_test.cc')
| -rw-r--r-- | test/cpp/util/time_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc index 1e501dfd28..48c6ce7697 100644 --- a/test/cpp/util/time_test.cc +++ b/test/cpp/util/time_test.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,7 +45,7 @@ namespace { class TimeTest : public ::testing::Test {}; TEST_F(TimeTest, AbsolutePointTest) { - long us = 10000000L; + int64_t us = 10000000L; gpr_timespec ts = gpr_time_from_micros(us, GPR_TIMESPAN); ts.clock_type = GPR_CLOCK_REALTIME; system_clock::time_point tp{microseconds(us)}; |