fix compiler warnings:

- defined but not used
- deprecated conversion from string constant to ‘char*’
pull/333/head
abma 2014-08-18 00:46:21 +02:00
parent d795491c48
commit 48a772b20b
2 changed files with 6 additions and 2 deletions

View File

@ -306,6 +306,7 @@ enum MeshChunkId
// float extremes [n_extremes][3]; // float extremes [n_extremes][3];
}; };
/*
static std::string MeshHeaderToString(MeshChunkId id) static std::string MeshHeaderToString(MeshChunkId id)
{ {
switch(id) switch(id)
@ -347,6 +348,7 @@ static std::string MeshHeaderToString(MeshChunkId id)
} }
return "Unknown_MeshChunkId"; return "Unknown_MeshChunkId";
} }
*/
enum SkeletonChunkId enum SkeletonChunkId
{ {
@ -393,6 +395,7 @@ enum SkeletonChunkId
// float scale : scale to apply to trans/scale keys // float scale : scale to apply to trans/scale keys
}; };
/*
static std::string SkeletonHeaderToString(SkeletonChunkId id) static std::string SkeletonHeaderToString(SkeletonChunkId id)
{ {
switch(id) switch(id)
@ -409,6 +412,7 @@ static std::string SkeletonHeaderToString(SkeletonChunkId id)
} }
return "Unknown_SkeletonChunkId"; return "Unknown_SkeletonChunkId";
} }
*/
} // Ogre } // Ogre
} // Assimp } // Assimp

View File

@ -43,7 +43,7 @@ void RemoveCommentsTest :: testSingleLineComments (void)
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void RemoveCommentsTest :: testMultiLineComments (void) void RemoveCommentsTest :: testMultiLineComments (void)
{ {
char* szTest = const char* szTest =
"/* comment to be removed */\n" "/* comment to be removed */\n"
"valid text /* \n " "valid text /* \n "
" comment across multiple lines */" " comment across multiple lines */"