X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fworkqueue.h;h=a8374a7a812413843c4057a1678f928d7994dfb8;hb=adec12c116e2e184cfa37d1c39cd2d83a7e89d31;hp=a17ec9df6a5e8f52261354c34eddb42dc0f30007;hpb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/workqueue.h b/gold/workqueue.h
index a17ec9df6a..a8374a7a81 100644
--- a/gold/workqueue.h
+++ b/gold/workqueue.h
@@ -1,6 +1,6 @@
 // workqueue.h -- the work queue for gold   -*- C++ -*-
 
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2006-2016 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -150,9 +150,9 @@ class Task_function : public Task
   // RUNNER and BLOCKER should be allocated using new, and will be
   // deleted after the task runs.
   Task_function(Task_function_runner* runner, Task_token* blocker,
-		const char* tname)
-    : runner_(runner), blocker_(blocker), name_(tname)
-  { }
+		const char* name)
+    : runner_(runner), blocker_(blocker), name_(name)
+  { gold_assert(blocker != NULL); }
 
   ~Task_function()
   {
@@ -268,7 +268,7 @@ class Workqueue
 
   // Return whether to cancel this thread.
   bool
-  should_cancel_thread();
+  should_cancel_thread(int thread_number);
 
   // Master Workqueue lock.  This controls access to the following
   // member variables.