Revision: 41074
http://brlcad.svn.sourceforge.net/brlcad/?rev=41074&view=rev
Author: brlcad
Date: 2010-10-19 04:18:25 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
rename nmg_struct_counts() to nmg_pr_m_struct_counts() since it conflicts with
the 'struct nmg_struct_counts' constructor during c++ compilation.
Modified Paths:
--------------
brlcad/trunk/doc/deprecation.txt
brlcad/trunk/include/raytrace.h
brlcad/trunk/src/librt/primitives/nmg/nmg_index.c
Modified: brlcad/trunk/doc/deprecation.txt
===================================================================
--- brlcad/trunk/doc/deprecation.txt 2010-10-19 03:51:20 UTC (rev 41073)
+++ brlcad/trunk/doc/deprecation.txt 2010-10-19 04:18:25 UTC (rev 41074)
@@ -47,6 +47,8 @@
7.16
----
+struct bu_structparse 'i' format
+ 'i' -> '%p' [deprecated 7.16]
SGI-specific tools
pl-sgi -> pl-fb [ deprecated 7.16 ]
Dunn camera and Canon printer tools
@@ -283,6 +285,9 @@
have been identified in reverse chronological order. As expressions
are not extensively tested, use with caution.
+s/nmg_struct_counts(/nmg_pr_m_struct_counts(/g
+ nmg_struct_counts() renamed to nmg_pr_m_struct_counts() [7.18]
+
s/bu_ptbl(\([^,]*\),[[:space:]]*BU_PTBL_INIT\([^)]*\))/bu_ptbl_init(\1, 64,
"init")/g
s/bu_ptbl(\([^,]*\),[[:space:]]*BU_PTBL_RST\([^)]*\))/bu_ptbl_reset(\1)/g
s/bu_ptbl(\([^,]*\),[[:space:]]*BU_PTBL_INS\([^)]*\))/bu_ptbl_ins(\1\2)/g
Modified: brlcad/trunk/include/raytrace.h
===================================================================
--- brlcad/trunk/include/raytrace.h 2010-10-19 03:51:20 UTC (rev 41073)
+++ brlcad/trunk/include/raytrace.h 2010-10-19 04:18:25 UTC (rev 41074)
@@ -5582,7 +5582,7 @@
RT_EXPORT BU_EXTERN(unsigned long **nmg_m_struct_count,
(struct nmg_struct_counts *ctr,
const struct model *m));
-RT_EXPORT BU_EXTERN(void nmg_struct_counts,
+RT_EXPORT BU_EXTERN(void nmg_pr_m_struct_counts,
(const struct model *m,
const char *str));
RT_EXPORT BU_EXTERN(void nmg_merge_models,
Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_index.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2010-10-19 03:51:20 UTC
(rev 41073)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_index.c 2010-10-19 04:18:25 UTC
(rev 41074)
@@ -735,7 +735,7 @@
* Count 'em up, and print 'em out.
*/
void
-nmg_struct_counts(const struct model *m, const char *str)
+nmg_pr_m_struct_counts(const struct model *m, const char *str)
{
struct nmg_struct_counts cnts;
unsigned long **tab;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
