aboutsummaryrefslogtreecommitdiff
path: root/gold/dirsearch.cc
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2006-11-29 17:56:40 +0000
committerIan Lance Taylor <iant@google.com>2006-11-29 17:56:40 +0000
commita3ad94edd406b9abc26493761764d4034dda69fa (patch)
tree96485e8bba91a4aa51f34b0d3738ef3e7ddcbac3 /gold/dirsearch.cc
parente1da3f5b9645750e966e471ff0db480d6450dcb7 (diff)
downloadgdb-a3ad94edd406b9abc26493761764d4034dda69fa.zip
gdb-a3ad94edd406b9abc26493761764d4034dda69fa.tar.gz
gdb-a3ad94edd406b9abc26493761764d4034dda69fa.tar.bz2
Hash tables, dynamic section, i386 PLT, gold_assert.
Diffstat (limited to 'gold/dirsearch.cc')
-rw-r--r--gold/dirsearch.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/gold/dirsearch.cc b/gold/dirsearch.cc
index 5dec3f6..d1298d8 100644
--- 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))