* gas/cris/rd-bcnst2-pic.d, gas/cris/rd-bcnst2.d,

[deliverable/binutils-gdb.git] / gold / dirsearch.h

diff --git a/gold/dirsearch.h b/gold/dirsearch.h
index c1af843b1bf2771a7d945c96c849a8880aaa7cca..639d49e2bb8dfb3888fa2f12630a6848645784d1 100644 (file)
--- a/gold/dirsearch.h
+++ b/gold/dirsearch.h
@@ -1,6 +1,6 @@
 // dirsearch.h -- directory searching for gold  -*- C++ -*-
 
-// Copyright 2006, 2007 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.
@@ -26,12 +26,14 @@
 #include <string>
 #include <list>
 
-#include "workqueue.h"
+#include "options.h"
+#include "token.h"
 
 namespace gold
 {
 
 class General_options;
+class Workqueue;
 
 // A simple interface to manage directories to be searched for
 // libraries.
@@ -40,7 +42,7 @@ class Dirsearch
 {
  public:
   Dirsearch()
-    : directories_(NULL), token_()
+    : directories_(NULL), token_(true)
   { }
 
   // Set the list of directories to search.
@@ -55,10 +57,10 @@ class Dirsearch
   std::string
   find(const std::string&, const std::string& n2, bool *is_in_sysroot) const;
 
-  // Return a reference to the blocker token which controls access.
-  const Task_token&
-  token() const
-  { return this->token_; }
+  // Return the blocker token which controls access.
+  Task_token*
+  token()
+  { return &this->token_; }
 
  private:
   // We can not copy this class.