diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:03:17 +0000 |
| commit | 5a3b9149085f033097663a63c90e152051fd6c56 (patch) | |
| tree | 4e0ed4ceabd2ce7b7fd7ed2c9168f7641c5ad8f3 /base/time.h | |
| parent | c5874079454b61b597de2258c4256d5008183b1a (diff) | |
| download | chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.zip chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.gz chromium_src-5a3b9149085f033097663a63c90e152051fd6c56.tar.bz2 | |
Revert "Fix a ton of compiler warnings."
This reverts commit r24792.
TBR=estade
Review URL: http://codereview.chromium.org/179028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24796 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 6a181af..a57c04f 100644 --- a/base/time.h +++ b/base/time.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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 Time(us_ + delta.delta_); + return us_ + delta.delta_; } Time operator-(TimeDelta delta) const { - return Time(us_ - delta.delta_); + return 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); - explicit Time(int64 us) : us_(us) { + Time(int64 us) : us_(us) { } // The representation of Jan 1, 1970 UTC in microseconds since the |