TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang 3.5 compile warnings/errors

Browse Source
This commit is contained in:
rdb 2015-04-04 15:59:12 +02:00
parent 44346769b4
commit 0082b7876f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/pnmimage/ppmcmap.cxx
View File

@ -83,7 +83,7 @@ ppm_computecolorhash(pixel** pixels,
int* colorsP) int* colorsP)
{ {
colorhash_table cht; colorhash_table cht;
register pixel* pP; pixel* pP;
colorhist_list chl; colorhist_list chl;
int col, row, hash; int col, row, hash;
@ -141,8 +141,8 @@ ppm_addtocolorhash(colorhash_table cht,
pixel* colorP, pixel* colorP,
int value) int value)
{ {
register int hash; int hash;
register colorhist_list chl; colorhist_list chl;
chl = (colorhist_list) malloc( sizeof(struct colorhist_list_item) ); chl = (colorhist_list) malloc( sizeof(struct colorhist_list_item) );
if ( chl == 0 ) if ( chl == 0 )

8
pandatool/src/dxf/dxfFile.cxx
View File

@ -585,20 +585,20 @@ get_group() {
change_state(ST_error); change_state(ST_error);
return false; return false;
} }
// Now skip past exactly one newline character and any number of // Now skip past exactly one newline character and any number of
// other whitespace characters. // other whitespace characters.
while (in!=0 && in.peek() != '\n') { while (in && in.peek() != '\n') {
in.get(); in.get();
} }
in.get(); in.get();
while (in!=0 && isspace(in.peek()) && in.peek() != '\n') { while (in && isspace(in.peek()) && in.peek() != '\n') {
in.get(); in.get();
} }
getline(in, _string); getline(in, _string);
_string = trim_right(_string); _string = trim_right(_string);
if (!in) { if (!in) {
change_state(ST_error); change_state(ST_error);
return false; return false;