* Idem (constness fix).
* `compare' in GCC 2.95 is broken.
This commit is contained in:
parent
4a266e35d4
commit
5dea0622d1
|
@ -63,7 +63,7 @@ static TableId dbSubstitutes = 0;
|
||||||
static TableId dbDerivers = 0;
|
static TableId dbDerivers = 0;
|
||||||
|
|
||||||
|
|
||||||
bool Substitute::operator == (const Substitute & sub)
|
bool Substitute::operator == (const Substitute & sub) const
|
||||||
{
|
{
|
||||||
return program == sub.program
|
return program == sub.program
|
||||||
&& args == sub.args;
|
&& args == sub.args;
|
||||||
|
@ -170,7 +170,7 @@ void copyPath(const Path & src, const Path & dst)
|
||||||
bool isInStore(const Path & path)
|
bool isInStore(const Path & path)
|
||||||
{
|
{
|
||||||
return path[0] == '/'
|
return path[0] == '/'
|
||||||
&& path.compare(0, nixStore.size(), nixStore) == 0
|
&& string(path, 0, nixStore.size()) == nixStore
|
||||||
&& path.size() >= nixStore.size() + 2
|
&& path.size() >= nixStore.size() + 2
|
||||||
&& path[nixStore.size()] == '/';
|
&& path[nixStore.size()] == '/';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue