From 648cfe3711317a84fc49b26a2b103d5ab34a26b4 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 22 Apr 2013 19:00:06 +1000 Subject: [PATCH] rename _X to avoid a collision with ctype.h --- code/client/snd_music.cpp | 2 +- code/qcommon/cm_test.cpp | 4 ++-- code/renderer/mdx_format.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/client/snd_music.cpp b/code/client/snd_music.cpp index 4d31660..21a4986 100644 --- a/code/client/snd_music.cpp +++ b/code/client/snd_music.cpp @@ -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 diff --git a/code/qcommon/cm_test.cpp b/code/qcommon/cm_test.cpp index e9125f9..7a9347f 100644 --- a/code/qcommon/cm_test.cpp +++ b/code/qcommon/cm_test.cpp @@ -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));} }; */ diff --git a/code/renderer/mdx_format.h b/code/renderer/mdx_format.h index 95df8e2..d0f6294 100644 --- a/code/renderer/mdx_format.h +++ b/code/renderer/mdx_format.h @@ -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 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 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