Revision: 42153
          http://brlcad.svn.sourceforge.net/brlcad/?rev=42153&view=rev
Author:   brlcad
Date:     2011-01-12 18:09:54 +0000 (Wed, 12 Jan 2011)

Log Message:
-----------
force inlining on the bounding box routines since gcc (4.0.1) complains that it 
cannot without increasing an inline limit.  remove inline from destructors (gcc 
is similiarly complaining that it cannot).

Modified Paths:
--------------
    brlcad/trunk/src/librt/opennurbs_ext.h

Modified: brlcad/trunk/src/librt/opennurbs_ext.h
===================================================================
--- brlcad/trunk/src/librt/opennurbs_ext.h      2011-01-12 18:06:41 UTC (rev 
42152)
+++ brlcad/trunk/src/librt/opennurbs_ext.h      2011-01-12 18:09:54 UTC (rev 
42153)
@@ -217,6 +217,7 @@
 
 template<class BA>
 inline 
+__attribute__((always_inline))
 BANode<BA>::BANode(const ON_Curve* curve, int adj_face_index, const BA& node,
                   const ON_BrepFace* face, const ON_Interval& t,
                   bool innerTrim, bool checkTrim, bool trimmed)
@@ -260,6 +261,7 @@
 
 template<class BA>
 inline
+__attribute__((always_inline))
 BANode<BA>::BANode(const BA& node) : m_node(node)
 {
     for (int i = 0; i < 3; i++) {
@@ -273,7 +275,6 @@
 
 
 template<class BA>
-inline
 BANode<BA>::~BANode()
 {
     // delete the children
@@ -340,6 +341,7 @@
 
 template<class BA>
 inline void
+__attribute__((always_inline))
 BANode<BA>::GetBBox(double* min, double* max) const
 {
     VSETALL(min, MAX_FASTF);
@@ -877,6 +879,7 @@
 
 template<class BV>
 inline 
+__attribute__((always_inline))
 BVNode<BV>::BVNode(CurveTree* ct, const BV& node, const ON_BrepFace* face,
                   const ON_Interval& u, const ON_Interval& v, bool checkTrim, 
bool trimmed)
     : m_ctree(ct), m_node(node), m_face(face), m_u(u), m_v(v), 
m_checkTrim(checkTrim), 
@@ -893,7 +896,6 @@
 
 
 template<class BV>
-inline
 BVNode<BV>::~BVNode() {
     // delete the children
     for (size_t i = 0; i < m_children.size(); i++) {
@@ -1298,7 +1300,7 @@
 
 
 template<class BV>
-inline bool
+bool
 BVNode<BV>::prepTrims()
 {
     CurveTree* ct = m_ctree;


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

------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to