Revision: 70236
http://sourceforge.net/p/brlcad/code/70236
Author: brlcad
Date: 2017-09-06 23:51:30 +0000 (Wed, 06 Sep 2017)
Log Message:
-----------
fix random splashing of type warnings from msvc 2017
Modified Paths:
--------------
brlcad/trunk/include/rt/db4.h
brlcad/trunk/src/brlman/brlman.c
brlcad/trunk/src/libbu/file.c
brlcad/trunk/src/libgcv/gcv.c
brlcad/trunk/src/librt/primitives/ars/ars.c
brlcad/trunk/src/librt/primitives/poly/poly.c
brlcad/trunk/src/util/plot3-dm.c
Modified: brlcad/trunk/include/rt/db4.h
===================================================================
--- brlcad/trunk/include/rt/db4.h 2017-09-06 23:50:48 UTC (rev 70235)
+++ brlcad/trunk/include/rt/db4.h 2017-09-06 23:51:30 UTC (rev 70236)
@@ -271,6 +271,7 @@
char a_id; /* ID_ARS_A */
char a_type; /* primitive type */
char a_name[NAMESIZE]; /* unique name */
+ /* these cannot be size_t due to v4 compatibility */
short a_m; /* # of curves */
short a_n; /* # of points per curve */
short a_curlen; /* # of granules per curve */
Modified: brlcad/trunk/src/brlman/brlman.c
===================================================================
--- brlcad/trunk/src/brlman/brlman.c 2017-09-06 23:50:48 UTC (rev 70235)
+++ brlcad/trunk/src/brlman/brlman.c 2017-09-06 23:51:30 UTC (rev 70236)
@@ -248,7 +248,7 @@
/* If we have a section identifier and it's not already the last
* element in argv, adjust the array */
if (i < uac - 1) {
- const char *tmp = argv[uac-1];
+ char *tmp = argv[uac-1];
argv[uac-1] = argv[i];
argv[i] = tmp;
}
Modified: brlcad/trunk/src/libbu/file.c
===================================================================
--- brlcad/trunk/src/libbu/file.c 2017-09-06 23:50:48 UTC (rev 70235)
+++ brlcad/trunk/src/libbu/file.c 2017-09-06 23:51:30 UTC (rev 70236)
@@ -206,8 +206,8 @@
#ifdef HAVE_GETFULLPATHNAME
HANDLE handle1, handle2;
- handle1 = _get_osfhandle(fd1);
- handle2 = _get_osfhandle(fd2);
+ handle1 = (HANDLE)_get_osfhandle(fd1);
+ handle2 = (HANDLE)_get_osfhandle(fd2);
ret = file_compare_info(handle1, handle2);
#else
Modified: brlcad/trunk/src/libgcv/gcv.c
===================================================================
--- brlcad/trunk/src/libgcv/gcv.c 2017-09-06 23:50:48 UTC (rev 70235)
+++ brlcad/trunk/src/libgcv/gcv.c 2017-09-06 23:51:30 UTC (rev 70236)
@@ -244,7 +244,7 @@
}
if (temp)
- bu_free(temp, "temp");
+ bu_free((void *)temp, "temp");
_gcv_filter_options_free(filter, *options_data);
return 0;
@@ -251,7 +251,7 @@
}
if (temp)
- bu_free(temp, "temp");
+ bu_free((void *)temp, "temp");
return 1;
}
Modified: brlcad/trunk/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ars/ars.c 2017-09-06 23:50:48 UTC (rev
70235)
+++ brlcad/trunk/src/librt/primitives/ars/ars.c 2017-09-06 23:51:30 UTC (rev
70236)
@@ -222,10 +222,10 @@
rec[0].a.a_id = ID_ARS_A;
rec[0].a.a_type = ARS; /* obsolete? */
- rec[0].a.a_m = arip->ncurves;
- rec[0].a.a_n = arip->pts_per_curve;
- rec[0].a.a_curlen = per_curve_grans;
- rec[0].a.a_totlen = per_curve_grans * arip->ncurves;
+ rec[0].a.a_m = (short)arip->ncurves;
+ rec[0].a.a_n = (short)arip->pts_per_curve;
+ rec[0].a.a_curlen = (short)per_curve_grans;
+ rec[0].a.a_totlen = (short)(per_curve_grans * arip->ncurves);
VMOVE(base_pt, &arip->curves[0][0]);
gno = 1;
@@ -243,8 +243,8 @@
bp->b_id = ID_ARS_B;
bp->b_type = ARSCONT; /* obsolete? */
- bp->b_n = cur+1; /* obsolete? */
- bp->b_ngranule = (npts/8)+1; /* obsolete? */
+ bp->b_n = (short)cur+1; /* obsolete? */
+ bp->b_ngranule = (short)((npts/8)+1); /* obsolete? */
lim = (left > 8) ? 8 : left;
for (el = 0; el < lim; el++) {
Modified: brlcad/trunk/src/librt/primitives/poly/poly.c
===================================================================
--- brlcad/trunk/src/librt/primitives/poly/poly.c 2017-09-06 23:50:48 UTC
(rev 70235)
+++ brlcad/trunk/src/librt/primitives/poly/poly.c 2017-09-06 23:51:30 UTC
(rev 70236)
@@ -756,7 +756,7 @@
}
rec[rno].q.q_id = ID_P_DATA;
- rec[rno].q.q_count = pp->npts;
+ rec[rno].q.q_count = (char)pp->npts;
for (i=0; i < pp->npts; i++) {
/* NOTE: type conversion to dbfloat_t */
VSCALE(rec[rno].q.q_verts[i],
Modified: brlcad/trunk/src/util/plot3-dm.c
===================================================================
--- brlcad/trunk/src/util/plot3-dm.c 2017-09-06 23:50:48 UTC (rev 70235)
+++ brlcad/trunk/src/util/plot3-dm.c 2017-09-06 23:51:30 UTC (rev 70236)
@@ -1001,7 +1001,7 @@
struct cmdtab *ctp;
for (ctp = commands; ctp->ct_name; ctp++) {
- (void)Tcl_CreateCommand(interp, ctp->ct_name, ctp->ct_func,
+ (void)Tcl_CreateCommand(interp, ctp->ct_name, (Tcl_CmdProc
*)ctp->ct_func,
(ClientData)ctp, (Tcl_CmdDeleteProc *)NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
