Author: sveinung
Date: Wed May  3 09:15:06 2017
New Revision: 35373

URL: http://svn.gna.org/viewcvs/freeciv?rev=35373&view=rev
Log:
Make enum type conversion explicit.

Reported by Marko Lindqvist

See hrm Bug #655955

Modified:
    branches/S3_0/client/client_main.c

Modified: branches/S3_0/client/client_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/client_main.c?rev=35373&r1=35372&r2=35373&view=diff
==============================================================================
--- branches/S3_0/client/client_main.c  (original)
+++ branches/S3_0/client/client_main.c  Wed May  3 09:15:06 2017
@@ -1411,7 +1411,8 @@
                         option_type_name(option_type(pset)));
 
   /* The option type is valid. */
-  fc_assert_ret_val(sset_type_is_valid(opt_type), sset_type_invalid());
+  fc_assert_ret_val(sset_type_is_valid((enum sset_type)opt_type),
+                    sset_type_invalid());
 
   /* Each server setting type value equals the client option type value with
    * the same meaning. */
@@ -1425,7 +1426,7 @@
 
   /* Exploit the fact that each server setting type value corresponds to the
    * client option type value with the same meaning. */
-  return opt_type;
+  return (enum sset_type)opt_type;
 }
 
 /***************************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to