summaryrefslogtreecommitdiffstats
path: root/base/message_loop.h
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 03:50:05 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 03:50:05 +0000
commit4bed5d848f83fdd740f533459fa7b6a1e7508f8c (patch)
tree3e04c773dc97147b14083f56764b6a8a5e3143f4 /base/message_loop.h
parent7534d489ea13fe9fcacc881b7abfe760b3a5513d (diff)
downloadchromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.zip
chromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.tar.gz
chromium_src-4bed5d848f83fdd740f533459fa7b6a1e7508f8c.tar.bz2
Reverting 7125.
removing the experiment Review URL: http://codereview.chromium.org/14188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
-rw-r--r--base/message_loop.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/base/message_loop.h b/base/message_loop.h
index 2e51234..6cd0ef4 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -269,19 +269,8 @@ class MessageLoop : public base::MessagePump::Delegate {
bool operator<(const PendingTask& other) const;
};
- // TEMP HACK: This is the same as std::less, except it has a data member.
- // This should cause its storage to be initialized, therefore avoiding a
- // UMR in pop(). Experiment for crbug.com/5555.
- template<class T>
- struct LessComparatorHack {
- LessComparatorHack() : junk(42) {}
- bool operator()(const T& a, const T& b) const { return a < b; }
- int junk;
- };
-
typedef std::queue<PendingTask> TaskQueue;
- typedef std::priority_queue<PendingTask, std::vector<PendingTask>,
- LessComparatorHack<PendingTask> > DelayedTaskQueue;
+ typedef std::priority_queue<PendingTask> DelayedTaskQueue;
#if defined(OS_WIN)
base::MessagePumpWin* pump_win() {