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

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

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11276 >

This patch moves the enum out as discussed, and obsoletes the original
patch.


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

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

Index: client/citydlg_common.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/citydlg_common.h,v
retrieving revision 1.27
diff -u -r1.27 citydlg_common.h
--- client/citydlg_common.h     29 Sep 2004 02:24:18 -0000      1.27
+++ client/citydlg_common.h     1 Dec 2004 20:24:26 -0000
@@ -23,15 +23,17 @@
 
 struct canvas;
 
+enum citizen_class {
+  CITIZEN_SPECIALIST,
+  CITIZEN_CONTENT,
+  CITIZEN_HAPPY,
+  CITIZEN_UNHAPPY,
+  CITIZEN_ANGRY,
+  CITIZEN_LAST
+};
+
 struct citizen_type {
-  enum {
-    CITIZEN_SPECIALIST,
-    CITIZEN_CONTENT,
-    CITIZEN_HAPPY,
-    CITIZEN_UNHAPPY,
-    CITIZEN_ANGRY,
-    CITIZEN_LAST
-  } type;
+  enum citizen_class type;
   Specialist_type_id spec_type;
 };