diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
| commit | be952c3ca6d93968409b246c9439a7d8c2a06bba (patch) | |
| tree | 501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /base/time.h | |
| parent | 86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff) | |
| download | chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2 | |
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.
BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest
patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 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 |