fix compiler warnings:
- defined but not used - deprecated conversion from string constant to ‘char*’pull/333/head
parent
d795491c48
commit
48a772b20b
|
@ -306,6 +306,7 @@ enum MeshChunkId
|
|||
// float extremes [n_extremes][3];
|
||||
};
|
||||
|
||||
/*
|
||||
static std::string MeshHeaderToString(MeshChunkId id)
|
||||
{
|
||||
switch(id)
|
||||
|
@ -347,6 +348,7 @@ static std::string MeshHeaderToString(MeshChunkId id)
|
|||
}
|
||||
return "Unknown_MeshChunkId";
|
||||
}
|
||||
*/
|
||||
|
||||
enum SkeletonChunkId
|
||||
{
|
||||
|
@ -393,6 +395,7 @@ enum SkeletonChunkId
|
|||
// float scale : scale to apply to trans/scale keys
|
||||
};
|
||||
|
||||
/*
|
||||
static std::string SkeletonHeaderToString(SkeletonChunkId id)
|
||||
{
|
||||
switch(id)
|
||||
|
@ -409,6 +412,7 @@ static std::string SkeletonHeaderToString(SkeletonChunkId id)
|
|||
}
|
||||
return "Unknown_SkeletonChunkId";
|
||||
}
|
||||
*/
|
||||
} // Ogre
|
||||
} // Assimp
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ void RemoveCommentsTest :: testSingleLineComments (void)
|
|||
// ------------------------------------------------------------------------------------------------
|
||||
void RemoveCommentsTest :: testMultiLineComments (void)
|
||||
{
|
||||
char* szTest =
|
||||
const char* szTest =
|
||||
"/* comment to be removed */\n"
|
||||
"valid text /* \n "
|
||||
" comment across multiple lines */"
|
||||
|
@ -62,4 +62,4 @@ void RemoveCommentsTest :: testMultiLineComments (void)
|
|||
CPPUNIT_ASSERT(0 == ::strcmp(szTest2,szTestResult));
|
||||
|
||||
delete[] szTest2;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue