diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 18:49:03 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 18:49:03 +0000 |
| commit | b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e (patch) | |
| tree | e00cd27155ea8fa615b85093d8ea2179cdf8d2c0 /base/time.cc | |
| parent | 96f960d08a15c3d125bd10b9ed60b69ea8ab0107 (diff) | |
| download | chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.zip chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.tar.gz chromium_src-b842d4c63ecce6aacb5aa1e184582ee1c5ce4a9e.tar.bz2 | |
Make int64 -> Time conversion explicit.
Landing Patch for Jacob Mandelson, original review: http://codereview.chromium.org/200093
BUG=none
TEST=base_unittests & app_unittests
Review URL: http://codereview.chromium.org/205003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time.cc')
| -rw-r--r-- | base/time.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/base/time.cc b/base/time.cc index 992e256..afe8c8f 100644 --- a/base/time.cc +++ b/base/time.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -51,7 +51,7 @@ int64 TimeDelta::InMicroseconds() const { Time Time::FromTimeT(time_t tt) { if (tt == 0) return Time(); // Preserve 0 so we can tell it doesn't exist. - return (tt * kMicrosecondsPerSecond) + kTimeTToMicrosecondsOffset; + return Time((tt * kMicrosecondsPerSecond) + kTimeTToMicrosecondsOffset); } time_t Time::ToTimeT() const { @@ -62,8 +62,9 @@ time_t Time::ToTimeT() const { // static Time Time::FromDoubleT(double dt) { - return (dt * static_cast<double>(kMicrosecondsPerSecond)) + - kTimeTToMicrosecondsOffset; + return Time(static_cast<int64>((dt * + static_cast<double>(kMicrosecondsPerSecond)) + + kTimeTToMicrosecondsOffset)); } double Time::ToDoubleT() const { |