[brlcad-commits] SF.net SVN: brlcad:[45690] brlcad/trunk/src/libged/edit.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2011-07-28 13:22:34
|
Revision: 45690 http://brlcad.svn.sourceforge.net/brlcad/?rev=45690&view=rev Author: brlcad Date: 2011-07-28 13:22:27 +0000 (Thu, 28 Jul 2011) Log Message: ----------- gcc 4.7 no longer considers these constant/computable at compile-time. so, meh, set them at runtime. Modified Paths: -------------- brlcad/trunk/src/libged/edit.c Modified: brlcad/trunk/src/libged/edit.c =================================================================== --- brlcad/trunk/src/libged/edit.c 2011-07-28 13:17:39 UTC (rev 45689) +++ brlcad/trunk/src/libged/edit.c 2011-07-28 13:22:27 UTC (rev 45690) @@ -1141,19 +1141,19 @@ * FIXME: Kind of dirty; haven't found a better way yet, though. */ struct edit_arg * -edit_rotate_get_next_arg_head(union edit_cmd * const cmd, - struct edit_arg *prev_arg_head) +edit_rotate_get_next_arg_head(union edit_cmd * const cmd, struct edit_arg *prev_arg_head) { - struct edit_arg *arg_heads[] = { - &cmd->rotate.objects, - &cmd->rotate.ref_axis.from, - &cmd->rotate.ref_axis.to, - &cmd->rotate.center, - &cmd->rotate.ref_angle.origin, - &cmd->rotate.ref_angle.from, - &cmd->rotate.ref_angle.to, - (struct edit_arg *)NULL - }; + struct edit_arg *arg_heads[8]; + + arg_heads[0] = &cmd->rotate.objects; + arg_heads[1] = &cmd->rotate.ref_axis.from; + arg_heads[2] = &cmd->rotate.ref_axis.to; + arg_heads[3] = &cmd->rotate.center; + arg_heads[4] = &cmd->rotate.ref_angle.origin; + arg_heads[5] = &cmd->rotate.ref_angle.from; + arg_heads[6] = &cmd->rotate.ref_angle.to; + arg_heads[7] = (struct edit_arg *)NULL; + return edit_cmd_get_next_arg_head(arg_heads, prev_arg_head); } @@ -1203,18 +1203,18 @@ } struct edit_arg * -edit_scale_get_next_arg_head(union edit_cmd * const cmd, - struct edit_arg *prev_arg_head) +edit_scale_get_next_arg_head(union edit_cmd * const cmd, struct edit_arg *prev_arg_head) { - struct edit_arg *arg_heads[] = { - &cmd->scale.objects, - &cmd->scale.ref_scale.from, - &cmd->scale.ref_scale.to, - &cmd->scale.center, - &cmd->scale.ref_factor.from, - &cmd->scale.ref_factor.to, - (struct edit_arg *)NULL - }; + struct edit_arg *arg_heads[7]; + + arg_heads[0] = &cmd->scale.objects; + arg_heads[1] = &cmd->scale.ref_scale.from; + arg_heads[2] = &cmd->scale.ref_scale.to; + arg_heads[3] = &cmd->scale.center; + arg_heads[4] = &cmd->scale.ref_factor.from; + arg_heads[5] = &cmd->scale.ref_factor.to; + arg_heads[6] = (struct edit_arg *)NULL; + return edit_cmd_get_next_arg_head(arg_heads, prev_arg_head); } @@ -1257,15 +1257,15 @@ } struct edit_arg * -edit_translate_get_next_arg_head(union edit_cmd * const cmd, - struct edit_arg *prev_arg_head) +edit_translate_get_next_arg_head(union edit_cmd * const cmd, struct edit_arg *prev_arg_head) { - struct edit_arg *arg_heads[] = { - &cmd->translate.objects, - &cmd->translate.ref_vector.from, - &cmd->translate.ref_vector.to, - (struct edit_arg *)NULL - }; + struct edit_arg *arg_heads[4]; + + arg_heads[0] = &cmd->translate.objects; + arg_heads[1] = &cmd->translate.ref_vector.from; + arg_heads[2] = &cmd->translate.ref_vector.to; + arg_heads[3] = (struct edit_arg *)NULL; + return edit_cmd_get_next_arg_head(arg_heads, prev_arg_head); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |