Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix assertion when debugging in visual studio (nw)

Browse Source
This commit is contained in:
smf- 2018-01-29 11:11:15 +00:00
parent 134db45d9d
commit 6fb696211b
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/netlist/plib/pstring.cpp
View File

@ -25,32 +25,28 @@ std::size_t strlen_mem(const T *s)
template<typename F>
int pstring_t<F>::compare(const pstring_t &right) const
{
std::size_t l = std::min(mem_t_size(), right.mem_t_size());
if (l == 0)
{
if (mem_t_size() == 0 && right.mem_t_size() == 0)
return 0;
else if (right.mem_t_size() == 0)
return 1;
else
return -1;
}
if (mem_t_size() == 0 && right.mem_t_size() == 0)
return 0;
else if (right.mem_t_size() == 0)
return 1;
else if (mem_t_size() == 0)
return -1;
auto si = this->begin();
auto ri = right.begin();
while (si != this->end() && *si == *ri)
while (si != this->end() && ri != right.end() && *si == *ri)
{
ri++;
si++;
}
int ret = (si == this->end() ? 0 : static_cast<int>(*si) - static_cast<int>(*ri));
if (ret == 0)
{
if (this->mem_t_size() > right.mem_t_size())
ret = 1;
else if (this->mem_t_size() < right.mem_t_size())
ret = -1;
}
return ret;
if (si != this->end() && ri != right.end())
return static_cast<int>(*si) - static_cast<int>(*ri);
else if (this->mem_t_size() > right.mem_t_size())
return 1;
else if (this->mem_t_size() < right.mem_t_size())
return -1;
return 0;
}
template<typename F>