size fixes for x86-64
This commit is contained in:
@@ -77,7 +77,7 @@ CString BacktraceNames::Format() const
|
|||||||
if( ShortenedPath != "" )
|
if( ShortenedPath != "" )
|
||||||
{
|
{
|
||||||
/* Abbreviate the module name. */
|
/* Abbreviate the module name. */
|
||||||
unsigned slash = ShortenedPath.rfind('/');
|
size_t slash = ShortenedPath.rfind('/');
|
||||||
if( slash != ShortenedPath.npos )
|
if( slash != ShortenedPath.npos )
|
||||||
ShortenedPath = ShortenedPath.substr(slash+1);
|
ShortenedPath = ShortenedPath.substr(slash+1);
|
||||||
ShortenedPath = CString("(") + ShortenedPath + ")";
|
ShortenedPath = CString("(") + ShortenedPath + ")";
|
||||||
@@ -316,7 +316,7 @@ void BacktraceNames::FromString( CString s )
|
|||||||
|
|
||||||
if( MangledAndOffset != "" )
|
if( MangledAndOffset != "" )
|
||||||
{
|
{
|
||||||
unsigned plus = MangledAndOffset.rfind('+');
|
size_t plus = MangledAndOffset.rfind('+');
|
||||||
|
|
||||||
if(plus == MangledAndOffset.npos)
|
if(plus == MangledAndOffset.npos)
|
||||||
{
|
{
|
||||||
@@ -410,8 +410,8 @@ void BacktraceNames::FromAddr( const void *p )
|
|||||||
if (mangledAndFile.size() == 3)
|
if (mangledAndFile.size() == 3)
|
||||||
{
|
{
|
||||||
File = mangledAndFile[2];
|
File = mangledAndFile[2];
|
||||||
unsigned pos = File.find('(');
|
size_t pos = File.find('(');
|
||||||
unsigned start = (pos == File.npos ? 0 : pos+1);
|
size_t start = (pos == File.npos ? 0 : pos+1);
|
||||||
pos = File.rfind(')') - 1;
|
pos = File.rfind(')') - 1;
|
||||||
File = File.substr(start, pos);
|
File = File.substr(start, pos);
|
||||||
}
|
}
|
||||||
@@ -431,8 +431,8 @@ void BacktraceNames::FromAddr( const void *p )
|
|||||||
if (mangledAndFile.size() > 3)
|
if (mangledAndFile.size() > 3)
|
||||||
{
|
{
|
||||||
File = mangledAndFile[3];
|
File = mangledAndFile[3];
|
||||||
unsigned pos = File.find('(');
|
size_t pos = File.find('(');
|
||||||
unsigned start = (pos == File.npos ? 0 : pos+1);
|
size_t start = (pos == File.npos ? 0 : pos+1);
|
||||||
pos = File.rfind(')') - 1;
|
pos = File.rfind(')') - 1;
|
||||||
File = File.substr(start, pos);
|
File = File.substr(start, pos);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user