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.cc | |
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.cc')
-rw-r--r-- | base/time.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/base/time.cc b/base/time.cc index 93b3311..992e256 100644 --- a/base/time.cc +++ b/base/time.cc @@ -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. @@ -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 Time((tt * kMicrosecondsPerSecond) + kTimeTToMicrosecondsOffset); + return (tt * kMicrosecondsPerSecond) + kTimeTToMicrosecondsOffset; } time_t Time::ToTimeT() const { @@ -62,9 +62,8 @@ time_t Time::ToTimeT() const { // static Time Time::FromDoubleT(double dt) { - return Time(static_cast<int64>((dt * - static_cast<double>(kMicrosecondsPerSecond)) + - kTimeTToMicrosecondsOffset)); + return (dt * static_cast<double>(kMicrosecondsPerSecond)) + + kTimeTToMicrosecondsOffset; } double Time::ToDoubleT() const { |