ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-25 21:51:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename _X to avoid a collision with ctype.h

Browse source
This commit is contained in:
Jonathan Gray 2013-04-25 12:48:12 +10:00
parent 2d66eb2b2b
commit ac358477fd
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codemp/client/snd_music.cpp
View file

@ -74,7 +74,7 @@ struct MusicExitTime_t // need to declare this way for operator < below
// I'm defining this '<' operator so STL's sort algorithm will work // I'm defining this '<' operator so STL's sort algorithm will work
// //
bool operator < (const MusicExitTime_t& _X) const {return (fTime < _X.fTime);} bool operator < (const MusicExitTime_t& _x) const {return (fTime < _x.fTime);}
}; };
// it's possible for all 3 of these to be empty if it's boss or death music // it's possible for all 3 of these to be empty if it's boss or death music

6
codemp/renderer/mdx_format.h
View file

@ -87,7 +87,7 @@ typedef struct
// (note that I've defined it using '>' internally, so it sorts with higher weights being "less", for distance weight-culling // (note that I've defined it using '>' internally, so it sorts with higher weights being "less", for distance weight-culling
// //
#ifdef __cplusplus #ifdef __cplusplus
bool operator < (const mdxmWeight_t& _X) const {return (boneWeight>_X.boneWeight);} bool operator < (const mdxmWeight_t& _x) const {return (boneWeight>_x.boneWeight);}
#endif #endif
} }
#ifndef __cplusplus #ifndef __cplusplus
@ -107,7 +107,7 @@ typedef struct
// I'm defining this '<' operator so this struct can be used as an STL <map> key... // I'm defining this '<' operator so this struct can be used as an STL <map> key...
// //
#ifdef __cplusplus #ifdef __cplusplus
bool operator < (const mdxaCompBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);} bool operator < (const mdxaCompBone_t& _x) const {return (memcmp(Comp,_x.Comp,sizeof(Comp))<0);}
#endif #endif
} }
#ifndef __cplusplus #ifndef __cplusplus
@ -126,7 +126,7 @@ typedef struct
// I'm defining this '<' operator so this struct can be used as an STL <map> key... // I'm defining this '<' operator so this struct can be used as an STL <map> key...
// //
#ifdef __cplusplus #ifdef __cplusplus
bool operator < (const mdxaCompQuatBone_t& _X) const {return (memcmp(Comp,_X.Comp,sizeof(Comp))<0);} bool operator < (const mdxaCompQuatBone_t& _x) const {return (memcmp(Comp,_x.Comp,sizeof(Comp))<0);}
#endif #endif
} }
#ifndef __cplusplus #ifndef __cplusplus