diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 08:10:48 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 21:14:44 +0000 |
| commit | 674f0eb973b8ebf08f9abcb45b2271dc510aa2cf (patch) | |
| tree | 250959a0e31c60721908968edb3025c8d9250d1c /src/backoff_entry.h | |
| parent | bcd3f6a43fe40184fb5d30860c6a2cf9f9e7a11e (diff) | |
| download | libweave-674f0eb973b8ebf08f9abcb45b2271dc510aa2cf.tar.gz | |
Pull the new r369476 of base library from Chromium
The merge was done against r369476 which corresponds to git commit
0471d0e2e2ef4a544a63481a389e1df33ea7c00a of Jan 14, 2016
Change-Id: Ie6894cf65424cc5ad115110faccd51602b2d1234
Reviewed-on: https://weave-review.googlesource.com/2225
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'src/backoff_entry.h')
| -rw-r--r-- | src/backoff_entry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backoff_entry.h b/src/backoff_entry.h index 002fb8d..422ffc7 100644 --- a/src/backoff_entry.h +++ b/src/backoff_entry.h @@ -38,11 +38,11 @@ class BackoffEntry { // Maximum amount of time we are willing to delay our request, -1 // for no maximum. - int64 maximum_backoff_ms; + int64_t maximum_backoff_ms; // Time to keep an entry from being discarded even when it // has no significant state, -1 to never discard. - int64 entry_lifetime_ms; + int64_t entry_lifetime_ms; // If true, we always use a delay of initial_delay_ms, even before // we've seen num_errors_to_ignore errors. Otherwise, initial_delay_ms |