summaryrefslogtreecommitdiffstats
path: root/base/time.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 20:41:10 +0000
commitbe952c3ca6d93968409b246c9439a7d8c2a06bba (patch)
tree501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /base/time.cc
parent86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff)
downloadchromium_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.cc')
-rw-r--r--base/time.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/base/time.cc b/base/time.cc
index 992e256..93b3311 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 {