[brlcad-commits] SF.net SVN: brlcad:[54136] brlcad/trunk/src

[caen23]

Revision: 54136
          http://brlcad.svn.sourceforge.net/brlcad/?rev=54136&view=rev
Author:   caen23
Date:     2013-01-04 19:46:42 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Small changes to enable compilation with LLVM 3.2

Modified Paths:
--------------
    brlcad/trunk/src/libbu/bitv.c
    brlcad/trunk/src/libged/scale.c

Modified: brlcad/trunk/src/libbu/bitv.c
===================================================================
--- brlcad/trunk/src/libbu/bitv.c       2013-01-04 17:44:11 UTC (rev 54135)
+++ brlcad/trunk/src/libbu/bitv.c       2013-01-04 19:46:42 UTC (rev 54136)
@@ -70,7 +70,7 @@
  * users should not call this directly, instead calling the
  * BU_BITV_SHIFT macro instead.
  */
-inline unsigned int
+unsigned int
 bu_bitv_shift()
 {
     return floor_ilog2(sizeof(bitv_t)*8);

Modified: brlcad/trunk/src/libged/scale.c
===================================================================
--- brlcad/trunk/src/libged/scale.c     2013-01-04 17:44:11 UTC (rev 54135)
+++ brlcad/trunk/src/libged/scale.c     2013-01-04 19:46:42 UTC (rev 54136)
@@ -37,7 +37,7 @@
 ged_scale_args(struct ged *gedp, int argc, const char *argv[], fastf_t *sf1, 
fastf_t *sf2, fastf_t *sf3)
 {
     static const char *usage = "sf (or) sfx sfy sfz";
-    int ret = GED_OK;
+    int ret = GED_OK, args_read;
     double scan;
 
     GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
@@ -65,19 +65,22 @@
        }
        *sf1 = scan;
     } else {
-       if (!sf1 || sscanf(argv[1], "%lf", &scan) != 1) {
+        args_read = sscanf(argv[1], "%lf", &scan);
+       if (!sf1 || args_read != 1) {
            bu_vls_printf(gedp->ged_result_str, "\nbad x scale factor '%s'", 
argv[1]);
            ret = GED_ERROR;
        }
        *sf1 = scan;
 
-       if (!sf2 || sscanf(argv[2], "%lf", &scan) != 1) {
+        args_read = sscanf(argv[2], "%lf", &scan);
+       if (!sf2 || args_read != 1) {
            bu_vls_printf(gedp->ged_result_str, "\nbad y scale factor '%s'", 
argv[2]);
            ret = GED_ERROR;
        }
        *sf2 = scan;
 
-       if (!sf3 || sscanf(argv[3], "%lf", &scan) != 1) {
+        args_read = sscanf(argv[3], "%lf", &scan);
+       if (!sf3 || args_read != 1) {
            bu_vls_printf(gedp->ged_result_str, "\nbad z scale factor '%s'", 
argv[3]);
            ret = GED_ERROR;
        }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits