ioquake
/
jedi-academy
mirror of https://github.com/ioquake/jedi-academy.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename _X to avoid a collision with ctype.h

This commit is contained in:
Jonathan Gray 2013-04-22 19:00:06 +10:00
parent 2c2667afcc
commit 648cfe3711
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/snd_music.cpp
View File

@ -64,7 +64,7 @@ struct MusicExitTime_t // need to declare this way for operator < below
// 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

4
code/qcommon/cm_test.cpp
View File

@ -17,13 +17,13 @@ public:
z(_z)
{
}
bool operator== (const CPoint& _P) const {return((x==_P.x)&&(y==_P.y)&&(z==_P.z));}
bool operator== (const CPoint& _p) const {return((x==_p.x)&&(y==_p.y)&&(z==_p.z));}
};
/*
class CPointComparator
{
public:
bool operator()(const CPoint& _A,const CPoint& _B) const {return((_A.x==_B.x)&&(_A.y==_B.y)&&(_A.z==_B.z));}
bool operator()(const CPoint& _a,const CPoint& _b) const {return((_a.x==_b.x)&&(_a.y==_b.y)&&(_a.z==_b.z));}
};
*/

6
code/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
//
#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
}
#ifndef __cplusplus
@ -107,7 +107,7 @@ typedef struct
// I'm defining this '<' operator so this struct can be used as an STL <map> key...
//
#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
}
#ifndef __cplusplus
@ -126,7 +126,7 @@ typedef struct
// I'm defining this '<' operator so this struct can be used as an STL <map> key...
//
#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
}
#ifndef __cplusplus