SF.net SVN: openvrml:[3903] trunk

[<br...@us...>]

Revision: 3903
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3903&view=rev
Author:   braden
Date:     2009-05-04 06:57:19 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Break out of the loop if the traversal has been halted.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml/node.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-04 04:08:11 UTC (rev 3902)
+++ trunk/ChangeLog	2009-05-04 06:57:19 UTC (rev 3903)
@@ -1,5 +1,12 @@
 2009-05-04 Braden McDaniel  <br...@en...>
 
+	* src/libopenvrml/openvrml/node.cpp
+	(openvrml::node_traverser::traverse(const
+	std::vector<boost::intrusive_ptr<node> > &)): Break out of the
+	loop if the traversal has been halted.
+
+2009-05-04 Braden McDaniel  <br...@en...>
+
 	Initialize the viewer in openvrml::gl::viewer::checkSensitive.
 
 	* src/libopenvrml-gl/openvrml/gl/viewer.cpp

Modified: trunk/src/libopenvrml/openvrml/node.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/node.cpp	2009-05-04 04:08:11 UTC (rev 3902)
+++ trunk/src/libopenvrml/openvrml/node.cpp	2009-05-04 06:57:19 UTC (rev 3903)
@@ -5815,13 +5815,14 @@
  *                      branch to traverse.
  */
 void
-openvrml::node_traverser::traverse(
-    const std::vector<boost::intrusive_ptr<node> > & nodes)
+openvrml::node_traverser::
+traverse(const std::vector<boost::intrusive_ptr<node> > & nodes)
 {
     assert(this->traversed_nodes.empty());
     try {
         typedef std::vector<boost::intrusive_ptr<node> > nodes_t;
-        for (nodes_t::const_iterator node(nodes.begin()); node != nodes.end();
+        for (nodes_t::const_iterator node(nodes.begin());
+             node != nodes.end() && !this->halt;
              ++node) {
             if (*node) {
                 if (this->traversed_nodes.find(node->get())


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