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.h | |
| 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.h')
| -rw-r--r-- | base/time.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/time.h b/base/time.h index a57c04f..6a181af 100644 --- a/base/time.h +++ b/base/time.h @@ -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. @@ -313,10 +313,10 @@ class Time { // Return a new time modified by some delta. Time operator+(TimeDelta delta) const { - return us_ + delta.delta_; + return Time(us_ + delta.delta_); } Time operator-(TimeDelta delta) const { - return us_ - delta.delta_; + return Time(us_ - delta.delta_); } // Comparison operators @@ -350,7 +350,7 @@ class Time { // |is_local = true| or UTC |is_local = false|. static Time FromExploded(bool is_local, const Exploded& exploded); - Time(int64 us) : us_(us) { + explicit Time(int64 us) : us_(us) { } // The representation of Jan 1, 1970 UTC in microseconds since the |