aboutsummaryrefslogtreecommitdiff
path: root/gold/workqueue.cc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2009-12-14 19:53:05 +0000
committerIan Lance Taylor <ian@airs.com>2009-12-14 19:53:05 +0000
commit2ea97941102380c28117882600265c1187c6fc8b (patch)
tree8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/workqueue.cc
parentab8e2090b6435823d50b29b7a255140ba6ea673f (diff)
downloadgdb-2ea97941102380c28117882600265c1187c6fc8b.zip
gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz
gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com> 2009-12-11 Nick Clifton <nickc@redhat.com> * configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/workqueue.cc')
-rw-r--r--gold/workqueue.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/gold/workqueue.cc b/gold/workqueue.cc
index 565c7fd..18c3900 100644
--- a/gold/workqueue.cc
+++ b/gold/workqueue.cc
@@ -1,6 +1,6 @@
// workqueue.cc -- the workqueue for gold
-// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
@@ -148,7 +148,7 @@ Workqueue::~Workqueue()
// waiting for a Token.
void
-Workqueue::add_to_queue(Task_list* que, Task* t, bool front)
+Workqueue::add_to_queue(Task_list* queue, Task* t, bool front)
{
Hold_lock hl(this->lock_);
@@ -164,9 +164,9 @@ Workqueue::add_to_queue(Task_list* que, Task* t, bool front)
else
{
if (front)
- que->push_front(t);
+ queue->push_front(t);
else
- que->push_back(t);
+ queue->push_back(t);
// Tell any waiting thread that there is work to do.
this->condvar_.signal();
}
@@ -441,11 +441,11 @@ Workqueue::release_locks(Task* t, Task_locker* tl)
{
// The token has been unblocked. Every waiting Task may
// now be runnable.
- Task* tok;
- while ((tok = token->remove_first_waiting()) != NULL)
+ Task* t;
+ while ((t = token->remove_first_waiting()) != NULL)
{
--this->waiting_;
- this->return_or_queue(tok, true, &ret);
+ this->return_or_queue(t, true, &ret);
}
}
}
@@ -458,11 +458,11 @@ Workqueue::release_locks(Task* t, Task_locker* tl)
// move all the Tasks to the runnable queue, to avoid a
// potential deadlock if the locking status changes before
// we run the next thread.
- Task* tok;
- while ((tok = token->remove_first_waiting()) != NULL)
+ Task* t;
+ while ((t = token->remove_first_waiting()) != NULL)
{
--this->waiting_;
- if (this->return_or_queue(tok, false, &ret))
+ if (this->return_or_queue(t, false, &ret))
break;
}
}