FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed a char* into const char* to fix Solaris build.

Browse Source
This commit is contained in:
Robert Osfield 2002-04-08 08:23:00 +00:00
parent 42a98c780b
commit 25fbc557b1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/MemoryManager.cpp
View File

@ -270,7 +270,7 @@ static void doCleanupLogOnFirstRun()
static const char *sourceFileStripper(const char *sourceFile)
{
char *ptr = strrchr(sourceFile, '\\');
const char *ptr = strrchr(sourceFile, '\\');
if (ptr) return ptr + 1;
ptr = strrchr(sourceFile, '/');
if (ptr) return ptr + 1;
@ -423,6 +423,9 @@ static void wipeWithPattern(sAllocUnit *allocUnit, unsigned long pattern,
char *cptr = (char *) lptr;
for (i = 0; i < (length & 0x3); i++, cptr++, shiftCount += 8)
{
char res1 = (pattern & (0xff << shiftCount)) >> shiftCount;
char res2 = static_cast<char>((pattern >> shiftCount) & 0xff);
assert(res1==res2);
*cptr = (pattern & (0xff << shiftCount)) >> shiftCount;
}
}