[Freeciv-Dev] (PR#12450) [C++] client/tilespec.h refers (again) to an enum constant out of scope

["Frédéric Brière" <fbriere@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12450 >

This is a virtually identical copy of #11276 that crept in in the past
few months.  Just like for #11276, I'm attaching a small patch that will
probably infuriate Vasco to no end. <g>

The better solution would be to bring the (anonymous) EDGE_* enum out of
the struct tile_edge.  As usual, speak ye a name and a patch ye shalt
receive!


-- 
             Frédéric Brière    <*>    fbriere@xxxxxxxxxxx

 =>  <fbriere@xxxxxxxxxx> IS NO MORE:  <http://www.abacomsucks.com>  <=

Index: client/tilespec.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v
retrieving revision 1.121
diff -u -r1.121 tilespec.h
--- client/tilespec.h   5 Mar 2005 23:51:05 -0000       1.121
+++ client/tilespec.h   7 Mar 2005 05:50:01 -0000
@@ -40,6 +40,10 @@
   const struct tile *tile[NUM_EDGE_TILES];
 };
 
+#ifdef __cplusplus
+#define EDGE_COUNT tile_edge::EDGE_COUNT
+#endif
+
 /* A corner is the endpoint of several edges.  At each corner 4 tiles will
  * meet (3 in hex view).  Tiles are in clockwise order NESW. */
 struct tile_corner {