diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 21:34:03 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 21:34:03 +0000 |
| commit | ee5feb9fa3859299c6be22a34f42be3b6e235bfd (patch) | |
| tree | da1be171b797dce284815d855bdd6b4cdc42375d /base/time_mac.cc | |
| parent | 9216e75e4625596446ed67cd1095b1f9f66fc81b (diff) | |
| download | chromium_src-ee5feb9fa3859299c6be22a34f42be3b6e235bfd.zip chromium_src-ee5feb9fa3859299c6be22a34f42be3b6e235bfd.tar.gz chromium_src-ee5feb9fa3859299c6be22a34f42be3b6e235bfd.tar.bz2 | |
Put the parentheses back where they belong in time_mac.cc. This will allow
Aaron's new test in http://codereview.chromium.org/4471001 to pass.
BUG=49233
TEST=base_unittests Time.FromExplodedWithMilliseconds from
http://codereview.chromium.org/4471001
Review URL: http://codereview.chromium.org/5042001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_mac.cc')
| -rw-r--r-- | base/time_mac.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/time_mac.cc b/base/time_mac.cc index 6dfaa20..ad31410 100644 --- a/base/time_mac.cc +++ b/base/time_mac.cc @@ -80,8 +80,8 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) { void Time::Explode(bool is_local, Exploded* exploded) const { CFAbsoluteTime seconds = - (static_cast<double>((us_ - kWindowsEpochDeltaMicroseconds) / - kMicrosecondsPerSecond) - kCFAbsoluteTimeIntervalSince1970); + ((static_cast<double>(us_) - kWindowsEpochDeltaMicroseconds) / + kMicrosecondsPerSecond) - kCFAbsoluteTimeIntervalSince1970; base::mac::ScopedCFTypeRef<CFTimeZoneRef> time_zone(is_local ? CFTimeZoneCopySystem() : NULL); |