Author: cazfi
Date: Thu Sep 3 05:34:39 2015
New Revision: 29761
URL: http://svn.gna.org/viewcvs/freeciv?rev=29761&view=rev
Log:
Replaced use of C++ reserved for 'this' in implementation of CLIP() macro with
'current'
See patch #6306
Modified:
branches/S2_5/utility/shared.h
Modified: branches/S2_5/utility/shared.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/shared.h?rev=29761&r1=29760&r2=29761&view=diff
==============================================================================
--- branches/S2_5/utility/shared.h (original)
+++ branches/S2_5/utility/shared.h Thu Sep 3 05:34:39 2015
@@ -46,8 +46,8 @@
#define MAX(x,y) (((x)>(y))?(x):(y))
#define MIN(x,y) (((x)<(y))?(x):(y))
#endif
-#define CLIP(lower,this,upper) \
- ((this)<(lower)?(lower):(this)>(upper)?(upper):(this))
+#define CLIP(lower,current,upper) \
+ ((current)<(lower)?(lower):(current)>(upper)?(upper):(current))
/* Note: Solaris already has a WRAP macro that is completely different. */
#define FC_WRAP(value, range) \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
