summaryrefslogtreecommitdiffstats
path: root/base/time_win.cc
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 21:29:33 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 21:29:33 +0000
commit593a16585ab9dd596b00f7a5c7c9f3ec5e98fca6 (patch)
treecbef6d7944d0ccb13a22a13356f14d0f94e8e6f8 /base/time_win.cc
parentd1b0c9f784ed4e45fef2944fa7146199bf983c9b (diff)
downloadchromium_src-593a16585ab9dd596b00f7a5c7c9f3ec5e98fca6.zip
chromium_src-593a16585ab9dd596b00f7a5c7c9f3ec5e98fca6.tar.gz
chromium_src-593a16585ab9dd596b00f7a5c7c9f3ec5e98fca6.tar.bz2
Temporary revert of r101474, will re-land tomorrow with a change to disable use of precompiled headers in Release builds as our Canary builds are failing with out of memory messages.
Original change description: Switch on use of precompiled headers for VS 2008. The precompiled header brings in more definitions of abs() for the base/time_win.cc file, and a hint to the compiler was needed to let VS 2008 build the file correctly. On VS 2008 only, the mini_installer target did not link correctly with precompiled headers enabled so this change disables them for that project. BUG=none TEST=it builds (esp. on Windows), existing tests pass Review URL: http://codereview.chromium.org/7910002 TBR=laforge@chromium.org Review URL: http://codereview.chromium.org/7945017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time_win.cc')
-rw-r--r--base/time_win.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/base/time_win.cc b/base/time_win.cc
index 9e6fe53..9bb04de 100644
--- a/base/time_win.cc
+++ b/base/time_win.cc
@@ -363,12 +363,7 @@ class HighResNowSingleton {
if (!IsUsingHighResClock())
return 0;
- // The static_cast<long> is needed as a hint to VS 2008 to tell it
- // which version of abs() to use. Other compilers don't seem to
- // need it, including VS 2010, but to keep code identical we use it
- // everywhere.
- // TODO(joi): Remove the hint if/when we no longer support VS 2008.
- return abs(static_cast<long>((UnreliableNow() - ReliableNow()) - skew_));
+ return abs((UnreliableNow() - ReliableNow()) - skew_);
}
private: