diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-26 19:28:16 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-26 19:28:16 +0000 |
| commit | 6297c0d67cb357c7d10e1708d5d3a0103afa04b5 (patch) | |
| tree | c1fbdd207e801fc46f417a230898a7e5d2040a5d /cpp | |
| parent | 771158fb2408e921d9aa912694aed0723a52a462 (diff) | |
| parent | 945d96387a716d0d82b195fa69a5e9a701249517 (diff) | |
| download | src-6297c0d67cb357c7d10e1708d5d3a0103afa04b5.tar.gz | |
Merge third_party/libaddressinput/src from https://chromium.googlesource.com/external/libaddressinput.git at 945d96387a716d0d82b195fa69a5e9a701249517
This commit was generated by merge_from_chromium.py.
Change-Id: I6d44b6a22e4174d435a4095eecf7974be32b4f38
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/validating_util.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/validating_util.cc b/cpp/src/validating_util.cc index 084c09c..9356689 100644 --- a/cpp/src/validating_util.cc +++ b/cpp/src/validating_util.cc @@ -84,7 +84,8 @@ bool UnwrapHeader(const char* header_prefix, void ValidatingUtil::Wrap(time_t timestamp, std::string* data) { assert(data != NULL); char timestamp_string[2 + 3 * sizeof timestamp]; - int size = std::sprintf(timestamp_string, "%ld", timestamp); + int size = + std::sprintf(timestamp_string, "%ld", static_cast<long>(timestamp)); assert(size > 0); assert(size < sizeof timestamp_string); (void)size; |