* target-descriptions.c (tdesc_named_type): Move code_ptr and data_ptr

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

diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc
index 5dec3f638d0df39fa7dcba592cda35e56254bc53..d1298d81757d1bbb218dd17382941aa938fbaa95 100644 (file)
--- a/gold/dirsearch.cc
+++ b/gold/dirsearch.cc
@@ -3,7 +3,6 @@
 #include "gold.h"
 
 #include <cerrno>
-#include <cassert>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -125,7 +124,7 @@ Dir_caches::add(const char* dirname)
 
     std::pair<const char*, Dir_cache*> v(dirname, cache);
     std::pair<Cache_hash::iterator, bool> p = this->caches_.insert(v);
-    assert(p.second);
+    gold_assert(p.second);
   }
 }
 
@@ -217,14 +216,14 @@ Dirsearch::add(Workqueue* workqueue, const General_options::Dir_list& list)
 std::string
 Dirsearch::find(const std::string& n1, const std::string& n2) const
 {
-  assert(!this->token_.is_blocked());
+  gold_assert(!this->token_.is_blocked());
 
   for (std::list<const char*>::const_iterator p = this->directories_.begin();
        p != this->directories_.end();
        ++p)
     {
       Dir_cache* pdc = caches.lookup(*p);
-      assert(pdc != NULL);
+      gold_assert(pdc != NULL);
       if (pdc->find(n1))
        return std::string(*p) + '/' + n1;
       if (!n2.empty() && pdc->find(n2))