Revision: 69047
http://sourceforge.net/p/brlcad/code/69047
Author: brlcad
Date: 2016-10-13 15:15:32 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
less API is better. consolidate all 7 BU_ASSERT*() macros into just one
BU_ASSERT(). the others existed so we could pretty-print their values, but
this is not incredibly helpful when we're tearing down the application as a
result. with bu_bomb giving a stack trace, the values may end up logged
anyways. this converts BU_ASSERT_PTR, BU_ASSERT_LONG, BU_ASSERT_SIZE_T,
BU_ASSERT_SSIZE_T, and BU_ASSERT_DOUBLE calls to BU_ASSERT.
Modified Paths:
--------------
brlcad/trunk/src/conv/asc/asc2g.c
brlcad/trunk/src/conv/g-dot.c
brlcad/trunk/src/conv/nmg/g-nmg.c
brlcad/trunk/src/conv/proe-g.c
brlcad/trunk/src/libanalyze/find_subtracted_shapes.cpp
brlcad/trunk/src/libanalyze/voxels.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libged/comb.c
brlcad/trunk/src/libged/combmem.c
brlcad/trunk/src/libged/dag.cpp
brlcad/trunk/src/libged/edit.c
brlcad/trunk/src/libged/ged.c
brlcad/trunk/src/libged/get_comb.c
brlcad/trunk/src/libged/lt.c
brlcad/trunk/src/libged/make_pnts.c
brlcad/trunk/src/libged/red.c
brlcad/trunk/src/libged/tables.c
brlcad/trunk/src/libged/track.c
brlcad/trunk/src/librt/attributes.c
brlcad/trunk/src/librt/binunif/db5_bin.c
brlcad/trunk/src/librt/bundle.c
brlcad/trunk/src/librt/comb/comb.c
brlcad/trunk/src/librt/comb/db_comb.c
brlcad/trunk/src/librt/db5_alloc.c
brlcad/trunk/src/librt/db5_io.c
brlcad/trunk/src/librt/db5_scan.c
brlcad/trunk/src/librt/db_alloc.c
brlcad/trunk/src/librt/db_fullpath.c
brlcad/trunk/src/librt/db_tree.c
brlcad/trunk/src/librt/prep.c
brlcad/trunk/src/librt/primitives/arb8/arb8.c
brlcad/trunk/src/librt/primitives/arbn/arbn.c
brlcad/trunk/src/librt/primitives/bot/bot.c
brlcad/trunk/src/librt/primitives/cline/cline.c
brlcad/trunk/src/librt/primitives/dsp/dsp.c
brlcad/trunk/src/librt/primitives/ehy/ehy.c
brlcad/trunk/src/librt/primitives/ell/ell.c
brlcad/trunk/src/librt/primitives/epa/epa.c
brlcad/trunk/src/librt/primitives/eto/eto.c
brlcad/trunk/src/librt/primitives/grip/grip.c
brlcad/trunk/src/librt/primitives/half/half.c
brlcad/trunk/src/librt/primitives/hrt/hrt.c
brlcad/trunk/src/librt/primitives/hyp/hyp.c
brlcad/trunk/src/librt/primitives/joint/joint.c
brlcad/trunk/src/librt/primitives/part/part.c
brlcad/trunk/src/librt/primitives/pipe/pipe.c
brlcad/trunk/src/librt/primitives/poly/poly.c
brlcad/trunk/src/librt/primitives/rhc/rhc.c
brlcad/trunk/src/librt/primitives/rpc/rpc.c
brlcad/trunk/src/librt/primitives/submodel/submodel.c
brlcad/trunk/src/librt/primitives/superell/superell.c
brlcad/trunk/src/librt/primitives/tgc/tgc.c
brlcad/trunk/src/librt/primitives/tor/tor.c
brlcad/trunk/src/librt/primitives/xxx/xxx.c
brlcad/trunk/src/librt/reduce_db.cpp
brlcad/trunk/src/librt/shoot.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/libwdb/mater.c
brlcad/trunk/src/libwdb/reg.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/wdb_obj.c
Modified: brlcad/trunk/src/conv/asc/asc2g.c
===================================================================
--- brlcad/trunk/src/conv/asc/asc2g.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/conv/asc/asc2g.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -457,7 +457,7 @@
ext.ext_nbytes = SIZEOF_NETWORK_LONG + 26*SIZEOF_NETWORK_LONG + 128 *
granules;
ext.ext_buf = (uint8_t *)bu_malloc(ext.ext_nbytes, "nmg ext_buf");
*(uint32_t *)ext.ext_buf = htonl(version);
- BU_ASSERT_LONG(version, ==, 1); /* DISK_MODEL_VERSION */
+ BU_ASSERT(version == 1); /* DISK_MODEL_VERSION */
/* Get next line of input with the 26 counts on it */
if (bu_fgets(buf, BUFSIZE, ifp) == (char *)0)
@@ -1054,7 +1054,7 @@
if (bu_fgets(buf, BUFSIZE, ifp) == NULL) break;
if (buf[0] != ID_P_DATA) break; /* 'Q' */
}
- BU_ASSERT_LONG(nlines, >, 0);
+ BU_ASSERT(nlines > 0);
/* Allocate storage for the faces */
BU_ALLOC(pg, struct rt_pg_internal);
Modified: brlcad/trunk/src/conv/g-dot.c
===================================================================
--- brlcad/trunk/src/conv/g-dot.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/conv/g-dot.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -119,7 +119,7 @@
if (node_count > 0) {
rt_tree_array = (struct rt_tree_array *)bu_calloc(node_count,
sizeof(struct rt_tree_array), "tree list");
actual_count = (struct rt_tree_array
*)db_flatten_tree(rt_tree_array, comb->tree, OP_UNION, 1, &rt_uniresource) -
rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
Modified: brlcad/trunk/src/conv/nmg/g-nmg.c
===================================================================
--- brlcad/trunk/src/conv/nmg/g-nmg.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/conv/nmg/g-nmg.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -350,7 +350,7 @@
sizeof(struct
rt_tree_array), "tree list");
actual_count = (struct rt_tree_array *)db_flatten_tree(tree_list,
comb->tree,
OP_UNION, 0, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
}
else {
tree_list = (struct rt_tree_array *)NULL;
Modified: brlcad/trunk/src/conv/proe-g.c
===================================================================
--- brlcad/trunk/src/conv/proe-g.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/conv/proe-g.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -959,7 +959,7 @@
tree_list = (struct rt_tree_array *)bu_calloc(node_count,
sizeof(struct
rt_tree_array), "tree list");
actual_count = (struct rt_tree_array *)db_flatten_tree(tree_list,
comb->tree, OP_UNION, 0, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
} else {
tree_list = (struct rt_tree_array *)NULL;
actual_count = 0;
Modified: brlcad/trunk/src/libanalyze/find_subtracted_shapes.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/find_subtracted_shapes.cpp 2016-10-13
15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libanalyze/find_subtracted_shapes.cpp 2016-10-13
15:15:32 UTC (rev 69047)
@@ -615,7 +615,7 @@
tree_list = (struct rt_tree_array *)bu_calloc(node_count,
sizeof(struct rt_tree_array), "tree list");
if (comb->tree) {
actual_count = BU_PTBL_LEN(&to_subtract) + (struct
rt_tree_array *)db_flatten_tree(tree_list, comb->tree, OP_UNION, 1,
&rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
}
for (size_t si = 0; si < BU_PTBL_LEN(&to_subtract); si++) {
Modified: brlcad/trunk/src/libanalyze/voxels.c
===================================================================
--- brlcad/trunk/src/libanalyze/voxels.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/libanalyze/voxels.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -186,7 +186,7 @@
yMin = (int)((rtip->mdl_min)[1]);
zMin = (int)((rtip->mdl_min)[2]);
- BU_ASSERT_LONG(levelOfDetail, >, 0);
+ BU_ASSERT(levelOfDetail > 0);
/* 1.0 / (levelOfDetail + 1) and effectiveDistance have to be used
multiple times in the following loops */
rayTraceDistance = 1. / levelOfDetail;
effectiveDistance = levelOfDetail * levelOfDetail * sizeVoxel[0];
Modified: brlcad/trunk/src/libbu/mappedfile.c
===================================================================
--- brlcad/trunk/src/libbu/mappedfile.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libbu/mappedfile.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -436,8 +436,8 @@
struct bu_vls str = BU_VLS_INIT_ZERO;
struct bu_mapped_file *ret;
- BU_ASSERT_PTR(name, !=, NULL);
- BU_ASSERT_PTR(pathp, !=, NULL);
+ BU_ASSERT(name != NULL);
+ BU_ASSERT(pathp != NULL);
/* Do not resort to path for a rooted filename */
if (name[0] == '/')
Modified: brlcad/trunk/src/libbu/parse.c
===================================================================
--- brlcad/trunk/src/libbu/parse.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libbu/parse.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -448,7 +448,7 @@
}
/* This number may differ from that stored as "claimed_length" */
- BU_ASSERT_LONG(bytes_used, <, INT_MAX);
+ BU_ASSERT(bytes_used < INT_MAX);
return (int)bytes_used;
}
Modified: brlcad/trunk/src/libged/comb.c
===================================================================
--- brlcad/trunk/src/libged/comb.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/comb.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -813,7 +813,7 @@
/* flatten tree */
if (comb->tree) {
actual_count = argc + (struct rt_tree_array
*)db_flatten_tree(tree_list, comb->tree, OP_UNION, 1, &rt_uniresource) -
tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
}
Modified: brlcad/trunk/src/libged/combmem.c
===================================================================
--- brlcad/trunk/src/libged/combmem.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/combmem.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -389,8 +389,8 @@
char op = '\0';
RT_CK_TREE(itp);
- BU_ASSERT_LONG(itp->tr_op, ==, OP_DB_LEAF);
- BU_ASSERT_PTR(itp->tr_l.tl_name, !=, NULL);
+ BU_ASSERT(itp->tr_op == OP_DB_LEAF);
+ BU_ASSERT(itp->tr_l.tl_name != NULL);
switch (rt_tree_array[i].tl_op) {
case OP_INTERSECT:
Modified: brlcad/trunk/src/libged/dag.cpp
===================================================================
--- brlcad/trunk/src/libged/dag.cpp 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/dag.cpp 2016-10-13 15:15:32 UTC (rev 69047)
@@ -361,7 +361,7 @@
if (node_count > 0) {
rt_tree_array = (struct rt_tree_array *)bu_calloc(node_count,
sizeof(struct rt_tree_array), "tree list");
actual_count = (struct rt_tree_array *)db_flatten_tree(rt_tree_array,
comb->tree, OP_UNION, 1, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
Modified: brlcad/trunk/src/libged/edit.c
===================================================================
--- brlcad/trunk/src/libged/edit.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/edit.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -799,7 +799,7 @@
&rt_uniresource, GED_ERROR);
comb_i = (struct rt_comb_internal *)intern.idb_ptr;
leaf = db_find_named_leaf(comb_i->tree, d_next->d_namep);
- BU_ASSERT_PTR(leaf, !=, TREE_NULL); /* path is validated */
+ BU_ASSERT(leaf != TREE_NULL); /* path is validated */
if (leaf->tr_l.tl_mat) {
MAT_DELTAS_GET(leaf_deltas, leaf->tr_l.tl_mat);
VADD2(*coord, *coord, leaf_deltas);
@@ -1002,7 +1002,7 @@
int i = 0;
/* never try to duplicate dissimilar command types */
- BU_ASSERT_PTR(dest->cmd, ==, src->cmd);
+ BU_ASSERT(dest->cmd == src->cmd);
src_head = src->cmd->get_arg_head(src, i);
do {
@@ -1378,7 +1378,7 @@
leaf_to_modify = db_find_named_leaf(comb->tree, d_obj->d_namep);
/* path is already validated */
- BU_ASSERT_PTR(leaf_to_modify, !=, TREE_NULL);
+ BU_ASSERT(leaf_to_modify != TREE_NULL);
if (!leaf_to_modify->tr_l.tl_mat) {
leaf_to_modify->tr_l.tl_mat = (matp_t)bu_malloc(sizeof(mat_t),
"mat_t block for
edit_translate()");
@@ -1459,11 +1459,11 @@
const int noisy = (flags & GED_ERROR); /* side with verbosity */
struct edit_arg *cur_arg = cmd->cmd_line.args;
- BU_ASSERT_PTR(cur_arg, !=, (struct edit_arg *)NULL);
+ BU_ASSERT(cur_arg != (struct edit_arg *)NULL);
if (cur_arg->type & EDIT_FROM) {
/* if there isn't an EDIT_TO, this func shouldn't be called */
- BU_ASSERT_PTR(cur_arg->next, !=, (struct edit_arg *)NULL);
+ BU_ASSERT(cur_arg->next != (struct edit_arg *)NULL);
/* disallow non-standard opts */
if (cur_arg->cl_options[0] != '\0')
@@ -1478,7 +1478,7 @@
/* If there isn't an EDIT_TARGET_OBJECT, this func shouldn't
* be called.
*/
- BU_ASSERT_PTR(cur_arg->next, !=, (struct edit_arg *)NULL);
+ BU_ASSERT(cur_arg->next != (struct edit_arg *)NULL);
/* disallow non-standard opts */
if (cur_arg->cl_options[0] != '\0')
Modified: brlcad/trunk/src/libged/ged.c
===================================================================
--- brlcad/trunk/src/libged/ged.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/ged.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -591,7 +591,7 @@
actual_count = (struct rt_tree_array *)db_flatten_tree(
rt_tree_array, comb->tree, OP_UNION,
1, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
Modified: brlcad/trunk/src/libged/get_comb.c
===================================================================
--- brlcad/trunk/src/libged/get_comb.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/get_comb.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -96,7 +96,7 @@
OP_UNION,
1,
&rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
rt_tree_array = (struct rt_tree_array *)NULL;
Modified: brlcad/trunk/src/libged/lt.c
===================================================================
--- brlcad/trunk/src/libged/lt.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/lt.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -68,7 +68,7 @@
actual_count = (struct rt_tree_array *)db_flatten_tree(
rt_tree_array, comb->tree, OP_UNION,
1, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
Modified: brlcad/trunk/src/libged/make_pnts.c
===================================================================
--- brlcad/trunk/src/libged/make_pnts.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/make_pnts.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -407,7 +407,7 @@
num_doubles_per_point = 10;
break;
}
- BU_ASSERT_PTR(headPoint, !=, NULL);
+ BU_ASSERT(headPoint != NULL);
pnts->point = headPoint;
if ((fp=fopen(argv[2], "rb")) == NULL) {
@@ -449,7 +449,7 @@
}
/* make sure we have something */
- BU_ASSERT_PTR(point, !=, NULL);
+ BU_ASSERT(point != NULL);
while (!found_eof && !done_processing_format_string) {
/* format_string_loop */
Modified: brlcad/trunk/src/libged/red.c
===================================================================
--- brlcad/trunk/src/libged/red.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/red.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -632,7 +632,7 @@
if (node_count > 0) {
rt_tree_array = (struct rt_tree_array *)bu_calloc(node_count,
sizeof(struct rt_tree_array), "tree list");
actual_count = (struct rt_tree_array *)db_flatten_tree(rt_tree_array,
comb->tree, OP_UNION, 0, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
} else {
rt_tree_array = (struct rt_tree_array *)NULL;
actual_count = 0;
Modified: brlcad/trunk/src/libged/tables.c
===================================================================
--- brlcad/trunk/src/libged/tables.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/tables.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -157,7 +157,7 @@
/* flatten tree */
actual_count = (struct rt_tree_array *)db_flatten_tree(tree_list,
comb->tree,
OP_UNION, 0, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
if (dp->d_flags & RT_DIR_REGION) {
struct bu_vls str = BU_VLS_INIT_ZERO;
Modified: brlcad/trunk/src/libged/track.c
===================================================================
--- brlcad/trunk/src/libged/track.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libged/track.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -1002,7 +1002,7 @@
actual_count = (struct rt_tree_array *)db_flatten_tree(
tree_list, comb->tree, OP_UNION,
1, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
@@ -1039,7 +1039,7 @@
tp->tr_l.tl_mat = (matp_t)NULL;
}
}
- BU_ASSERT_SIZE_T(node_count, ==, actual_count + (size_t)new_nodes);
+ BU_ASSERT(node_count == actual_count + (size_t)new_nodes);
/* rebuild the tree with GIFT semantics */
comb->tree = (union tree *)db_mkgift_tree(tree_list, node_count,
&rt_uniresource);
Modified: brlcad/trunk/src/librt/attributes.c
===================================================================
--- brlcad/trunk/src/librt/attributes.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/attributes.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -38,7 +38,7 @@
BU_CK_EXTERNAL(ap);
- BU_ASSERT_LONG(ap->ext_nbytes, >=, 4);
+ BU_ASSERT(ap->ext_nbytes >= 4);
/* First pass -- count number of attributes */
cp = (const char *)ap->ext_buf;
@@ -85,10 +85,10 @@
++cp;
}
/* Ensure we're exactly at the end */
- BU_ASSERT_PTR(cp, ==, ep);
+ BU_ASSERT(cp == ep);
#else
/* Ensure we're exactly at the end */
- BU_ASSERT_PTR(cp+1, ==, ep);
+ BU_ASSERT(cp+1 == ep);
#endif
/* not really needed for AVS_ADD since bu_avs_add will
@@ -133,13 +133,13 @@
++cp;
}
/* Ensure we're exactly at the end */
- BU_ASSERT_PTR(cp, ==, ep);
+ BU_ASSERT(cp == ep);
#else
- BU_ASSERT_PTR(cp+1, ==, ep);
+ BU_ASSERT(cp+1 == ep);
#endif
- BU_ASSERT_LONG(avs->count, <=, avs->max);
- BU_ASSERT_LONG((size_t)avs->count, ==, (size_t)count);
+ BU_ASSERT(avs->count <= avs->max);
+ BU_ASSERT((size_t)avs->count == (size_t)count);
if (bu_debug & BU_DEBUG_AVS) {
bu_avs_print(avs, "db5_import_attributes");
@@ -214,7 +214,7 @@
/* sanity check */
need = cp - ((char *)ext->ext_buf);
- BU_ASSERT_LONG(need, ==, ext->ext_nbytes);
+ BU_ASSERT(need == ext->ext_nbytes);
}
@@ -243,7 +243,7 @@
return -1;
}
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
if (db_get_external(&ext, dp, dbip) < 0)
return -2; /* FAIL */
@@ -306,7 +306,7 @@
return -1;
}
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
if (db_get_external(&ext, dp, dbip) < 0)
return -2; /* FAIL */
Modified: brlcad/trunk/src/librt/binunif/db5_bin.c
===================================================================
--- brlcad/trunk/src/librt/binunif/db5_bin.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/binunif/db5_bin.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -129,7 +129,7 @@
/*
* There's no particular size to expect
*
- * BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3*4);
+ * BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 3*4);
*/
RT_CK_DB_INTERNAL(ip);
Modified: brlcad/trunk/src/librt/bundle.c
===================================================================
--- brlcad/trunk/src/librt/bundle.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/bundle.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -153,7 +153,7 @@
rt_init_resource(resp, resp->re_cpu, rtip);
/* Ensure that this CPU's resource structure is registered */
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu), !=,
NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu) != NULL);
}
solidbits = rt_get_solidbitv(rtip->nsolids, resp);
Modified: brlcad/trunk/src/librt/comb/comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/comb.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/comb/comb.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -182,7 +182,7 @@
mi = (ssize_t)-1;
}
- BU_ASSERT_SSIZE_T(mi, <, (ssize_t)ssp->nmat);
+ BU_ASSERT(mi < (ssize_t)ssp->nmat);
/* there should be a better way than casting
* 'mi' from ssize_t to size_t
@@ -354,11 +354,11 @@
if (comb->tree)
rt_comb_v5_serialize(comb->tree, &ss);
- BU_ASSERT_SIZE_T(ss.mat_num, ==, tcs.n_mat);
- BU_ASSERT_PTR(ss.matp, ==, cp + tcs.n_mat * (ELEMENTS_PER_MAT *
SIZEOF_NETWORK_DOUBLE));
- BU_ASSERT_PTR(ss.leafp, ==, leafp_end);
+ BU_ASSERT(ss.mat_num == tcs.n_mat);
+ BU_ASSERT(ss.matp == cp + tcs.n_mat * (ELEMENTS_PER_MAT *
SIZEOF_NETWORK_DOUBLE));
+ BU_ASSERT(ss.leafp == leafp_end);
if (rpn_len)
- BU_ASSERT_PTR(ss.exprp, <=, ((unsigned char *)ep->ext_buf) +
ep->ext_nbytes);
+ BU_ASSERT(ss.exprp <= ((unsigned char *)ep->ext_buf) + ep->ext_nbytes);
/* Encode all the other stuff as attributes. */
/* WARNING: We remove const from the ip pointer!!! */
@@ -529,7 +529,7 @@
double scanmat[16];
/* Unpack indicated matrix mi */
- BU_ASSERT_SIZE_T(mi, <, nmat);
+ BU_ASSERT(mi < nmat);
/* read matrix */
bu_cv_ntohd((unsigned char *)scanmat,
&matp[mi*ELEMENTS_PER_MAT*SIZEOF_NETWORK_DOUBLE], ELEMENTS_PER_MAT);
@@ -608,7 +608,7 @@
tbl1 = tmp;
bu_ptbl_trunc(tbl2, 0);
}
- BU_ASSERT_PTR(leafp, ==, leafp_end);
+ BU_ASSERT(leafp == leafp_end);
goto finish;
}
@@ -652,7 +652,7 @@
double scanmat[16];
/* Unpack indicated matrix mi */
- BU_ASSERT_SIZE_T(mi, <, nmat);
+ BU_ASSERT(mi < nmat);
/* read matrix */
bu_cv_ntohd((unsigned char *)scanmat,
&matp[mi*ELEMENTS_PER_MAT*SIZEOF_NETWORK_DOUBLE], ELEMENTS_PER_MAT);
@@ -714,10 +714,10 @@
/* Push this node on the stack */
*sp++ = tp;
}
- BU_ASSERT_PTR(leafp, ==, leafp_end);
+ BU_ASSERT(leafp == leafp_end);
/* There should only be one thing left on the stack, the result */
- BU_ASSERT_PTR(sp, ==, &stack[1]);
+ BU_ASSERT(sp == &stack[1]);
comb->tree = stack[0];
RT_CK_TREE(comb->tree);
Modified: brlcad/trunk/src/librt/comb/db_comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/db_comb.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/comb/db_comb.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -436,7 +436,7 @@
/* Convert tree into array form */
actual_count = db_flatten_tree(rt_tree_array, comb->tree,
OP_UNION, 1, resp) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
rt_tree_array = (struct rt_tree_array *)NULL;
@@ -621,8 +621,8 @@
union tree *itp = rt_tree_array[i].tl_tree;
RT_CK_TREE(itp);
- BU_ASSERT_LONG(itp->tr_op, ==, OP_DB_LEAF);
- BU_ASSERT_PTR(itp->tr_l.tl_name, !=, NULL);
+ BU_ASSERT(itp->tr_op == OP_DB_LEAF);
+ BU_ASSERT(itp->tr_l.tl_name != NULL);
switch (rt_tree_array[i].tl_op) {
case OP_INTERSECT:
@@ -1023,7 +1023,7 @@
RT_CK_RESOURCE(resp);
- BU_ASSERT_SIZE_T(subtreecount, <, LONG_MAX);
+ BU_ASSERT(subtreecount < LONG_MAX);
treecount = (long)subtreecount;
/*
Modified: brlcad/trunk/src/librt/db5_alloc.c
===================================================================
--- brlcad/trunk/src/librt/db5_alloc.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/db5_alloc.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -105,14 +105,14 @@
bu_log("db5_realloc(%s) dbip=%p, dp=%p, ext_nbytes=%ld\n",
dp->d_namep, (void *)dbip, (void *)dp, ep->ext_nbytes);
- BU_ASSERT_LONG(ep->ext_nbytes&7, ==, 0);
+ BU_ASSERT((ep->ext_nbytes&7) == 0);
if (dp->d_addr != RT_DIR_PHONY_ADDR && ep->ext_nbytes == dp->d_len) {
if (RT_G_DEBUG&DEBUG_DB)
bu_log("db5_realloc(%s) current allocation is exactly right.\n",
dp->d_namep);
return 0;
}
- if (dp->d_addr == RT_DIR_PHONY_ADDR) BU_ASSERT_LONG(dp->d_len, ==, 0);
+ if (dp->d_addr == RT_DIR_PHONY_ADDR) BU_ASSERT(dp->d_len == 0);
baseaddr = dp->d_addr;
baselen = dp->d_len;
@@ -191,7 +191,7 @@
if (RT_G_DEBUG&DEBUG_DB)
bu_log("db5_realloc(%s) obtained free block at %ld, len=%zu\n",
dp->d_namep, mmp->m_addr, mmp->m_size);
- BU_ASSERT_LONG((size_t)mmp->m_size, >=, (size_t)ep->ext_nbytes);
+ BU_ASSERT((size_t)mmp->m_size >= (size_t)ep->ext_nbytes);
if ((size_t)mmp->m_size == (size_t)ep->ext_nbytes) {
/* No need to reformat, existing free object is perfect */
dp->d_addr = mmp->m_addr;
Modified: brlcad/trunk/src/librt/db5_io.c
===================================================================
--- brlcad/trunk/src/librt/db5_io.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/db5_io.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -535,7 +535,7 @@
* followed by no bytes (for an empty value), followed by a NULL value
termination,
* followed by a NULL attribute-value termination. Minimum is 4 bytes
*/
- BU_ASSERT_PTR(attrib->ext_nbytes, >=, 4);
+ BU_ASSERT(attrib->ext_nbytes >= 4);
cp = db5_encode_length(cp, attrib->ext_nbytes, a_width);
memcpy(cp, attrib->ext_buf, attrib->ext_nbytes);
cp += attrib->ext_nbytes;
@@ -557,14 +557,14 @@
/* Verify multiple of 8 */
togo = cp - ((unsigned char *)out->ext_buf);
- BU_ASSERT_LONG(togo&7, ==, 0);
+ BU_ASSERT((togo&7) == 0);
/* Finally, go back to the header and write the actual object length */
cp = ((unsigned char *)out->ext_buf) + sizeof(struct db5_ondisk_header);
(void)db5_encode_length(cp, togo>>3, h_width);
out->ext_nbytes = togo;
- BU_ASSERT_LONG(out->ext_nbytes, >=, 8);
+ BU_ASSERT(out->ext_nbytes >= 8);
}
void
@@ -576,8 +576,8 @@
BU_CK_EXTERNAL(ep);
- BU_ASSERT_SIZE_T(length, >=, 8);
- BU_ASSERT_SIZE_T(length&7, ==, 0);
+ BU_ASSERT(length >= 8);
+ BU_ASSERT((length&7) == 0);
/* Reserve enough space to hold any free header, even w/64-bit len */
ep->ext_nbytes = 8+8;
@@ -605,8 +605,8 @@
BU_CK_EXTERNAL(ep);
- BU_ASSERT_SIZE_T(length, >=, 8);
- BU_ASSERT_SIZE_T(length&7, ==, 0);
+ BU_ASSERT(length >= 8);
+ BU_ASSERT((length&7) == 0);
ep->ext_buf = (uint8_t *)bu_calloc(1, length, "db5_make_free_object");
ep->ext_nbytes = length;
@@ -711,7 +711,7 @@
name);
return -1;
}
- BU_ASSERT_LONG(raw.h_dli, ==, DB5HDR_HFLAGS_DLI_APPLICATION_DATA_OBJECT);
+ BU_ASSERT(raw.h_dli == DB5HDR_HFLAGS_DLI_APPLICATION_DATA_OBJECT);
/* See if name needs to be changed */
if (raw.name.ext_buf == NULL || !BU_STR_EQUAL(name, (const char
*)raw.name.ext_buf)) {
@@ -755,7 +755,7 @@
return -1;
}
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
/* First, change the name. */
if (db_wrap_v5_external(ep, dp->d_namep) < 0) {
@@ -771,7 +771,7 @@
return -5;
}
}
- BU_ASSERT_LONG(ep->ext_nbytes, ==, dp->d_len);
+ BU_ASSERT(ep->ext_nbytes == dp->d_len);
if (dp->d_flags & RT_DIR_INMEM) {
memcpy(dp->d_un.ptr, (char *)ep->ext_buf, ep->ext_nbytes);
@@ -797,7 +797,7 @@
RT_CK_DIR(dp);
RT_CK_DBI(dbip);
RT_CK_DB_INTERNAL(ip);
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
if (resp)
RT_CK_RESOURCE(resp);
@@ -816,7 +816,7 @@
goto fail;
}
}
- BU_ASSERT_LONG(ext.ext_nbytes, ==, dp->d_len);
+ BU_ASSERT(ext.ext_nbytes == dp->d_len);
if (dp->d_flags & RT_DIR_INMEM) {
memcpy(dp->d_un.ptr, ext.ext_buf, ext.ext_nbytes);
@@ -873,7 +873,7 @@
resp = &rt_uniresource;
}
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
if (db5_get_raw_internal_ptr(&raw, ep->ext_buf) == NULL) {
bu_log("rt_db_external5_to_internal5(%s): import failure\n",
@@ -972,7 +972,7 @@
RT_CK_RESOURCE(resp);
}
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
if (db_get_external(&ext, dp, dbip) < 0)
return -2; /* FAIL */
@@ -1011,7 +1011,7 @@
int ret;
RT_CK_DBI(dbip);
- BU_ASSERT_LONG(dbip->dbi_version, ==, 5);
+ BU_ASSERT(dbip->dbi_version == 5);
db5_export_color_table(&str, dbip);
Modified: brlcad/trunk/src/librt/db5_scan.c
===================================================================
--- brlcad/trunk/src/librt/db5_scan.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/db5_scan.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -76,7 +76,7 @@
addr += (off_t)raw.object_length;
}
dbip->dbi_eof = addr;
- BU_ASSERT_LONG(dbip->dbi_eof, ==, (off_t)dbip->dbi_mf->buflen);
+ BU_ASSERT(dbip->dbi_eof == (off_t)dbip->dbi_mf->buflen);
} else {
/* In a totally portable way, read the database with stdio */
rewind(dbip->dbi_fp);
Modified: brlcad/trunk/src/librt/db_alloc.c
===================================================================
--- brlcad/trunk/src/librt/db_alloc.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/db_alloc.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -188,7 +188,7 @@
if (dbip->dbi_read_only)
return -1;
- BU_ASSERT_LONG(dbip->dbi_version, ==, 4);
+ BU_ASSERT(dbip->dbi_version == 4);
if (dp->d_len < start)
return -1;
@@ -216,7 +216,7 @@
RT_CK_RESOURCE(resp);
BU_CK_PTBL(&resp->re_directory_blocks);
- BU_ASSERT_PTR(resp->re_directory_hd, ==, NULL);
+ BU_ASSERT(resp->re_directory_hd == NULL);
/* Get a BIG block */
bytes = (size_t)bu_malloc_len_roundup(1024*sizeof(struct directory));
Modified: brlcad/trunk/src/librt/db_fullpath.c
===================================================================
--- brlcad/trunk/src/librt/db_fullpath.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/db_fullpath.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -198,7 +198,7 @@
long j;
RT_CK_FULL_PATH(pp);
- BU_ASSERT_SIZE_T(pp->fp_len, <, LONG_MAX);
+ BU_ASSERT(pp->fp_len < LONG_MAX);
len = 3; /* leading slash, trailing null, spare */
for (j=pp->fp_len-1; j >= 0; j--) {
@@ -426,7 +426,7 @@
pp->fp_names[nslash++] = dp;
cp = slashp+1;
}
- BU_ASSERT_SIZE_T(nslash, ==, pp->fp_len);
+ BU_ASSERT(nslash == pp->fp_len);
bu_free(copy, "db_string_to_path() duplicate string");
return ret;
}
@@ -498,7 +498,7 @@
RT_CK_FULL_PATH(a);
RT_CK_FULL_PATH(b);
- BU_ASSERT_SIZE_T(a->fp_len, <, LONG_MAX);
+ BU_ASSERT(a->fp_len < LONG_MAX);
if (a->fp_len != b->fp_len) return 0;
@@ -583,7 +583,7 @@
RT_CK_FULL_PATH(a);
RT_CK_DIR(dp);
- BU_ASSERT_SIZE_T(a->fp_len, <, LONG_MAX);
+ BU_ASSERT(a->fp_len < LONG_MAX);
for (i = a->fp_len-1; i >= 0; i--) {
if (a->fp_names[i] == dp) return 1;
Modified: brlcad/trunk/src/librt/db_tree.c
===================================================================
--- brlcad/trunk/src/librt/db_tree.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/db_tree.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -1261,7 +1261,7 @@
case OP_NOP:
break;
case OP_DB_LEAF:
- BU_ASSERT_PTR(tp->tr_l.tl_name, !=, NULL);
+ BU_ASSERT(tp->tr_l.tl_name != NULL);
break;
case OP_SOLID:
if (tp->tr_a.tu_stp)
Modified: brlcad/trunk/src/librt/prep.c
===================================================================
--- brlcad/trunk/src/librt/prep.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/prep.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -283,7 +283,7 @@
rtip->rti_dbip->dbi_uses);
for (BU_LIST_FOR(regp, region, &(rtip->HeadRegion))) {
/* Ensure bit numbers are unique */
- BU_ASSERT_PTR(rtip->Regions[regp->reg_bit], ==, REGION_NULL);
+ BU_ASSERT(rtip->Regions[regp->reg_bit] == REGION_NULL);
rtip->Regions[regp->reg_bit] = regp;
rt_optim_tree(regp->reg_treetop, resp);
rt_solid_bitfinder(regp->reg_treetop, regp, resp);
@@ -323,7 +323,7 @@
bu_log("2nd soltab also claiming that bit is (st_rtip=%p):\n",
(void *)stp->st_rtip);
rt_pr_soltab(stp);
}
- BU_ASSERT_PTR(*ssp, ==, SOLTAB_NULL);
+ BU_ASSERT(*ssp == SOLTAB_NULL);
*ssp = stp;
rtip->rti_nsol_by_type[stp->st_id]++;
} RT_VISIT_ALL_SOLTABS_END;
@@ -669,8 +669,8 @@
if (!resp)
return;
- BU_ASSERT_LONG(cpu_num, >=, 0);
- BU_ASSERT_LONG(cpu_num, <, MAX_PSW);
+ BU_ASSERT(cpu_num >= 0);
+ BU_ASSERT(cpu_num < MAX_PSW);
if (rtip)
RT_CK_RTI(rtip);
@@ -680,7 +680,7 @@
} else {
if (rtip != NULL && rtip->rti_treetop) {
/* this is a submodel */
- BU_ASSERT_LONG(cpu_num, <, (long)rtip->rti_resources.blen);
+ BU_ASSERT(cpu_num < (long)rtip->rti_resources.blen);
}
}
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -1320,7 +1320,7 @@
BU_CK_EXTERNAL(ep);
if (dbip) RT_CK_DBI(dbip);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3*8);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 3*8);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_ARB8;
Modified: brlcad/trunk/src/librt/primitives/arbn/arbn.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arbn/arbn.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/arbn/arbn.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -951,7 +951,7 @@
double_count = neqn * ELEMENTS_PER_PLANE;
byte_count = double_count * SIZEOF_NETWORK_DOUBLE;
- BU_ASSERT_LONG(ep->ext_nbytes, ==, 4+ byte_count);
+ BU_ASSERT(ep->ext_nbytes == 4+ byte_count);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_ARBN;
Modified: brlcad/trunk/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bot/bot.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/bot/bot.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -3346,7 +3346,7 @@
/* bu_log("increasing %i from capacity %ld given next is %ld\n", slot,
bin_capacity[slot], bin_todonext[slot]); */
- BU_ASSERT_LONG(bin_capacity[slot], <, LONG_MAX / 2);
+ BU_ASSERT(bin_capacity[slot] < LONG_MAX / 2);
bin[slot] = bu_realloc(bin[slot], bin_capacity[slot] * 2 *
sizeof(int), "increase vertices bin");
bin_capacity[slot] *= 2;
Modified: brlcad/trunk/src/librt/primitives/cline/cline.c
===================================================================
--- brlcad/trunk/src/librt/primitives/cline/cline.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/cline/cline.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -899,7 +899,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 8);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 8);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/dsp/dsp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/dsp/dsp.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/dsp/dsp.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -4333,7 +4333,7 @@
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, >, 141);
+ BU_ASSERT(ep->ext_nbytes > 141);
RT_CK_DB_INTERNAL(ip);
Modified: brlcad/trunk/src/librt/primitives/ehy/ehy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ehy/ehy.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/ehy/ehy.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1414,7 +1414,7 @@
for (i = 0; i < nseg; i++)
vells[nell-1][i] = (struct vertex *)NULL;
face = 0;
- BU_ASSERT_PTR(outfaceuses, !=, NULL);
+ BU_ASSERT(outfaceuses != NULL);
if ((outfaceuses[face++] = nmg_cface(s, vells[nell-1], nseg)) == 0) {
bu_log("rt_ehy_tess() failure, top face\n");
goto fail;
@@ -1781,7 +1781,7 @@
BU_CK_EXTERNAL(ep);
if (dbip) RT_CK_DBI(dbip);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3*4);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 3*4);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1351,7 +1351,7 @@
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE *
ELEMENTS_PER_VECT*4);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * ELEMENTS_PER_VECT*4);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_ELL;
Modified: brlcad/trunk/src/librt/primitives/epa/epa.c
===================================================================
--- brlcad/trunk/src/librt/primitives/epa/epa.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/epa/epa.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1755,7 +1755,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 11);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 11);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/eto/eto.c
===================================================================
--- brlcad/trunk/src/librt/primitives/eto/eto.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/eto/eto.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1442,7 +1442,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 11);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 11);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/grip/grip.c
===================================================================
--- brlcad/trunk/src/librt/primitives/grip/grip.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/grip/grip.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -344,7 +344,7 @@
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 7);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 7);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_GRIP;
Modified: brlcad/trunk/src/librt/primitives/half/half.c
===================================================================
--- brlcad/trunk/src/librt/primitives/half/half.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/half/half.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -640,7 +640,7 @@
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE *
ELEMENTS_PER_PLANE);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * ELEMENTS_PER_PLANE);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/hrt/hrt.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hrt/hrt.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/hrt/hrt.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1569,7 +1569,7 @@
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE *
(ELEMENTS_PER_VECT*4 + 1));
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * (ELEMENTS_PER_VECT*4 +
1));
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_HRT;
Modified: brlcad/trunk/src/librt/primitives/hyp/hyp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/hyp/hyp.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/hyp/hyp.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -926,7 +926,7 @@
for (i = 0; i < nseg; i++)
vells[nell-1][i] = (struct vertex *)NULL;
face = 0;
- BU_ASSERT_PTR(outfaceuses, !=, NULL);
+ BU_ASSERT(outfaceuses != NULL);
if ((outfaceuses[face++] = nmg_cface(s, vells[nell-1], nseg)) == 0) {
bu_log("rt_hyp_tess() failure, top face\n");
goto fail;
@@ -1045,7 +1045,7 @@
for (i = 0; i < nseg; i++)
vells[0][i] = (struct vertex *)NULL;
- BU_ASSERT_PTR(outfaceuses, !=, NULL);
+ BU_ASSERT(outfaceuses != NULL);
if ((outfaceuses[face++] = nmg_cface(s, vells[0], nseg)) == 0) {
bu_log("rt_hyp_tess() failure, top face\n");
goto fail;
@@ -1193,7 +1193,7 @@
BU_CK_EXTERNAL(ep);
if (dbip) RT_CK_DBI(dbip);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3 * 4);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 3 * 4);
/* set up the internal structure */
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/joint/joint.c
===================================================================
--- brlcad/trunk/src/librt/primitives/joint/joint.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/joint/joint.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -308,7 +308,7 @@
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, >=, SIZEOF_NETWORK_DOUBLE *
JOINT_FLOAT_SIZE + 1);
+ BU_ASSERT(ep->ext_nbytes >= SIZEOF_NETWORK_DOUBLE * JOINT_FLOAT_SIZE + 1);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_JOINT;
Modified: brlcad/trunk/src/librt/primitives/part/part.c
===================================================================
--- brlcad/trunk/src/librt/primitives/part/part.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/part/part.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -1599,7 +1599,7 @@
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 8);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 8);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/pipe/pipe.c
===================================================================
--- brlcad/trunk/src/librt/primitives/pipe/pipe.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/pipe/pipe.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -4080,7 +4080,7 @@
double_count = pipe_count * 6;
byte_count = double_count * SIZEOF_NETWORK_DOUBLE;
total_count = 4 + byte_count;
- BU_ASSERT_LONG(ep->ext_nbytes, == , total_count);
+ BU_ASSERT(ep->ext_nbytes == total_count);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/poly/poly.c
===================================================================
--- brlcad/trunk/src/librt/primitives/poly/poly.c 2016-10-13 15:10:31 UTC
(rev 69046)
+++ brlcad/trunk/src/librt/primitives/poly/poly.c 2016-10-13 15:15:32 UTC
(rev 69047)
@@ -936,11 +936,11 @@
/* maximum possible vertices */
max_pts = ip_pg->npoly * ip_pg->max_npts;
- BU_ASSERT_SIZE_T(max_pts, >, 0);
+ BU_ASSERT(max_pts > 0);
/* maximum possible triangular faces */
max_tri = ip_pg->npoly * 3;
- BU_ASSERT_SIZE_T(max_tri, >, 0);
+ BU_ASSERT(max_tri > 0);
ip_bot->num_vertices = 0;
ip_bot->num_faces = 0;
Modified: brlcad/trunk/src/librt/primitives/rhc/rhc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rhc/rhc.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/rhc/rhc.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1566,7 +1566,7 @@
}
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, == , SIZEOF_NETWORK_DOUBLE * 11);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 11);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/rpc/rpc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/rpc/rpc.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/rpc/rpc.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1423,7 +1423,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 10);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 10);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/submodel/submodel.c
===================================================================
--- brlcad/trunk/src/librt/primitives/submodel/submodel.c 2016-10-13
15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/primitives/submodel/submodel.c 2016-10-13
15:15:32 UTC (rev 69047)
@@ -344,7 +344,7 @@
MAT4XSCALOR(up_segp->seg_out.hit_dist, submodel->subm2m,
outseg->seg_out.hit_dist);
up_segp->seg_out.hit_dist -= gp->delta;
- BU_ASSERT_DOUBLE(up_segp->seg_in.hit_dist, <=,
up_segp->seg_out.hit_dist);
+ BU_ASSERT(up_segp->seg_in.hit_dist <= up_segp->seg_out.hit_dist);
/* Link to ray in upper model, not submodel */
up_segp->seg_in.hit_rayp = &up_ap->a_ray;
@@ -477,7 +477,7 @@
*/
restbl = &submodel->rtip->rti_resources; /* a ptbl */
cpu = ap->a_resource->re_cpu;
- BU_ASSERT_SIZE_T(cpu, <, BU_PTBL_LEN(restbl));
+ BU_ASSERT(cpu < BU_PTBL_LEN(restbl));
if ((resp = (struct resource *)BU_PTBL_GET(restbl, cpu)) == NULL) {
/* First ray for this cpu for this submodel, alloc up */
BU_ALLOC(resp, struct resource);
Modified: brlcad/trunk/src/librt/primitives/superell/superell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/superell/superell.c 2016-10-13
15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/primitives/superell/superell.c 2016-10-13
15:15:32 UTC (rev 69047)
@@ -870,7 +870,7 @@
RT_CK_DB_INTERNAL(ip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE *
(ELEMENTS_PER_VECT*4 + 2));
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * (ELEMENTS_PER_VECT*4 +
2));
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
ip->idb_type = ID_SUPERELL;
Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1697,7 +1697,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE *
ELEMENTS_PER_VECT*6);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * ELEMENTS_PER_VECT*6);
RT_CK_DB_INTERNAL(ip);
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/primitives/tor/tor.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tor/tor.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/tor/tor.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1614,7 +1614,7 @@
if (dbip) RT_CK_DBI(dbip);
BU_CK_EXTERNAL(ep);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * (2*3+2));
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * (2*3+2));
RT_CK_DB_INTERNAL(ip);
Modified: brlcad/trunk/src/librt/primitives/xxx/xxx.c
===================================================================
--- brlcad/trunk/src/librt/primitives/xxx/xxx.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/primitives/xxx/xxx.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -345,7 +345,7 @@
BU_CK_EXTERNAL(ep);
if (dbip) RT_CK_DBI(dbip);
- BU_ASSERT_LONG(ep->ext_nbytes, ==, SIZEOF_NETWORK_DOUBLE * 3*4);
+ BU_ASSERT(ep->ext_nbytes == SIZEOF_NETWORK_DOUBLE * 3*4);
/* set up the internal structure */
ip->idb_major_type = DB5_MAJORTYPE_BRLCAD;
Modified: brlcad/trunk/src/librt/reduce_db.cpp
===================================================================
--- brlcad/trunk/src/librt/reduce_db.cpp 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/librt/reduce_db.cpp 2016-10-13 15:15:32 UTC (rev
69047)
@@ -322,7 +322,7 @@
sizeof(rt_tree_array), "tree list"));
const std::size_t actual_count = (struct rt_tree_array *)db_flatten_tree(
tree_list.ptr, comb.tree, OP_UNION,
false, &rt_uniresource) - tree_list.ptr;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
for (std::size_t i = 0; i < node_count; ++i) {
struct directory * const member_dir = db_lookup(&db,
Modified: brlcad/trunk/src/librt/shoot.c
===================================================================
--- brlcad/trunk/src/librt/shoot.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/librt/shoot.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -937,7 +937,7 @@
}
/* Ensure that this CPU's resource structure is registered */
if (resp != &rt_uniresource)
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu), !=,
NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu) != NULL);
solidbits = rt_get_solidbitv(rtip->nsolids, resp);
@@ -1383,7 +1383,7 @@
register fastf_t dist;
dist = (*psp)->mindist;
- BU_ASSERT_DOUBLE(dist, <, INFINITY);
+ BU_ASSERT(dist < INFINITY);
if (dist < pending_hit) {
pending_hit = dist;
if (debug_shoot) bu_log("pending_hit lowered to %g
by %s\n", pending_hit, (*psp)->stp->st_name);
@@ -1609,7 +1609,7 @@
rt_init_resource(resp, resp->re_cpu, rtip);
}
/* Ensure that this CPU's resource structure is registered */
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu), !=, NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, resp->re_cpu) != NULL);
/* Verify that direction vector has unit length */
if (RT_G_DEBUG) {
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2016-10-13 15:10:31 UTC (rev
69046)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2016-10-13 15:15:32 UTC (rev
69047)
@@ -1682,7 +1682,7 @@
/* initialize ged_obj */
BU_ALLOC(top->to_gop, struct ged_obj);
- BU_ASSERT_PTR(gedp, !=, NULL);
+ BU_ASSERT(gedp != NULL);
top->to_gop->go_gedp = gedp;
top->to_gop->go_gedp->ged_output_handler = to_output_handler;
@@ -1691,7 +1691,7 @@
top->to_gop->go_gedp->ged_create_vlist_callback = to_create_vlist_callback;
top->to_gop->go_gedp->ged_free_vlist_callback = to_free_vlist_callback;
- BU_ASSERT_PTR(gedp->ged_gdp, !=, NULL);
+ BU_ASSERT(gedp->ged_gdp != NULL);
top->to_gop->go_gedp->ged_gdp->gd_rtCmdNotify =
to_rt_end_callback_internal;
bu_vls_init(&top->to_gop->go_name);
@@ -14967,7 +14967,7 @@
* rt_clean() will clean 'em up.
*/
rt_init_resource(&resp, 0, rtip);
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, 0) != NULL);
BU_ALLOC(ap, struct application);
RT_APPLICATION_INIT(ap);
Modified: brlcad/trunk/src/libwdb/mater.c
===================================================================
--- brlcad/trunk/src/libwdb/mater.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libwdb/mater.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -41,7 +41,7 @@
{
RT_CK_WDB(ofp);
if (db_version(ofp->dbip) < 5) {
- BU_ASSERT_LONG(mk_version, ==, 4);
+ BU_ASSERT(mk_version == 4);
bu_log("mk_write_color_table(): not implemented for v4 database\n");
} else {
Modified: brlcad/trunk/src/libwdb/reg.c
===================================================================
--- brlcad/trunk/src/libwdb/reg.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/libwdb/reg.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -129,7 +129,7 @@
if (comb->tree) {
/* Release storage for non-leaf nodes, steal leaves */
actual_count = (struct rt_tree_array *)db_flatten_tree(tree_list,
comb->tree, OP_UNION, 1, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
@@ -166,7 +166,7 @@
tp->tr_l.tl_mat = (matp_t)NULL;
}
}
- BU_ASSERT_SIZE_T(node_count, ==, actual_count + (size_t)new_nodes);
+ BU_ASSERT(node_count == actual_count + (size_t)new_nodes);
/* rebuild the tree with GIFT semantics */
comb->tree = (union tree *)db_mkgift_tree(tree_list, node_count,
&rt_uniresource);
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/mged/cmd.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -1735,7 +1735,7 @@
*/
BU_ALLOC(resp, struct resource);
rt_init_resource(resp, 0, rtip);
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, 0) != NULL);
BU_ALLOC(ap, struct application);
RT_APPLICATION_INIT(ap);
Modified: brlcad/trunk/src/mged/wdb_obj.c
===================================================================
--- brlcad/trunk/src/mged/wdb_obj.c 2016-10-13 15:10:31 UTC (rev 69046)
+++ brlcad/trunk/src/mged/wdb_obj.c 2016-10-13 15:15:32 UTC (rev 69047)
@@ -1399,7 +1399,7 @@
/* flatten tree */
if (comb->tree) {
actual_count = 1 + (struct rt_tree_array *)db_flatten_tree(tree_list,
comb->tree, OP_UNION, 1, &rt_uniresource) - tree_list;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
}
@@ -3008,7 +3008,7 @@
* Once on the rti_resources list, rt_clean() will clean 'em up.
*/
rt_init_resource(&resp, 0, rtip);
- BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL);
+ BU_ASSERT(BU_PTBL_GET(&rtip->rti_resources, 0) != NULL);
BU_ALLOC(ap, struct application);
RT_APPLICATION_INIT(ap);
@@ -6471,7 +6471,7 @@
actual_count = (struct rt_tree_array *)db_flatten_tree(
rt_tree_array, comb->tree, OP_UNION,
1, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
@@ -6675,7 +6675,7 @@
actual_count = (struct rt_tree_array *)db_flatten_tree(
rt_tree_array, comb->tree, OP_UNION,
1, &rt_uniresource) - rt_tree_array;
- BU_ASSERT_SIZE_T(actual_count, ==, node_count);
+ BU_ASSERT(actual_count == node_count);
comb->tree = TREE_NULL;
} else {
actual_count = 0;
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
