[Boost-commit] svn:boost r49039 - in sandbox/SOC/2006/tree/trunk: boost/tree/detail/algorithm boost/tree/detail/algorithm/cursor libs/tree/test

Subject: [Boost-commit] svn:boost r49039 - in sandbox/SOC/2006/tree/trunk: boost/tree/detail/algorithm boost/tree/detail/algorithm/cursor libs/tree/test
From: ockham_at_[hidden]
Date: 2008-09-29 17:05:43

Author: bernhard.reiter
Date: 2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
New Revision: 49039
URL: http://svn.boost.org/trac/boost/changeset/49039

Log:
Some cleanup.
Text files modified: 
   sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/inorder.hpp   |     6 ------                                  
   sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/iterative.hpp |    10 ++++++----                              
   sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/postorder.hpp |    14 ++++----------                          
   sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/preorder.hpp  |     4 ----                                    
   sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/iterator.hpp         |     4 ----                                    
   sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp              |     1 +                                       
   sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp       |     2 +-                                      
   7 files changed, 12 insertions(+), 29 deletions(-)

Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/inorder.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/inorder.hpp	(original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/inorder.hpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -9,15 +9,9 @@
  * Subtree intorder traversal and search algorithms
  */
 
-// TODO: concept checks.
-
 #ifndef BOOST_TREE_DETAIL_ALGORITHM_CURSOR_INORDER_HPP
 #define BOOST_TREE_DETAIL_ALGORITHM_CURSOR_INORDER_HPP
 
-//#ifdef BOOST_RECURSIVE_ORDER_ALGORITHMS
-#include <boost/tree/detail/algorithm/cursor/common.hpp>
-//#endif
-
 #include <boost/tree/root_tracking_cursor.hpp>
 #include <boost/tree/ascending_cursor.hpp>
 

Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/iterative.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/iterative.hpp	(original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/iterative.hpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -35,7 +35,8 @@
 }
 
 /**
- * @brief   Apply a function to every element of a subtree, in the given order.
+ * @brief   Apply a function to every element of a subtree, 
+ *          in the order specified by the first parameter.
  * @param s A cursor.
  * @param f A unary function object.
  * @return  @p f
@@ -69,7 +70,8 @@
 }
 
 /**
- * @brief   Copies the subtree s into t, by traversing s in the given order.
+ * @brief   Copies the subtree s into t, by traversing s
+ *          in the order specified by the first parameter.
  * @param s An input cursor.
  * @param t An output cursor.
  * @result  A cursor past t's *order end, after the copying operation.
@@ -102,8 +104,8 @@
 }
 
 /**
- * @brief       Performs an operation on a subtree, by traversing it in 
- *              the given order.
+ * @brief       Performs an operation on a subtree, by traversing it  
+ *              in the order specified by the first parameter.
  * @param s     An input cursor.
  * @param t     An output cursor.
  * @param op    A unary operation.

Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/postorder.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/postorder.hpp	(original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/postorder.hpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -9,15 +9,9 @@
  * Subtree postorder traversal algorithms
  */
 
-// TODO: concept checks.
-
 #ifndef BOOST_TREE_DETAIL_ALGORITHM_CURSOR_POSTORDER_HPP
 #define BOOST_TREE_DETAIL_ALGORITHM_CURSOR_POSTORDER_HPP
 
-//#ifdef BOOST_RECURSIVE_ORDER_ALGORITHMS
-#include <boost/tree/detail/algorithm/cursor/common.hpp>
-//#endif
-
 #include <boost/tree/root_tracking_cursor.hpp>
 #include <boost/tree/ascending_cursor.hpp>
 
@@ -132,7 +126,7 @@
  * @endif
  */
 template <class Cursor, class Op>
-void for_each_recursive(postorder(), Cursor s, Op& f)
+void for_each_recursive(postorder, Cursor s, Op& f)
 {
     Cursor t = s;
     for (s.to_begin(); s != t.end(); ++s)
@@ -158,7 +152,7 @@
  */
 //[ postorder_for_each
 template <class Cursor, class Op>
-Op for_each(postorder(), Cursor s, Op f)
+Op for_each(postorder, Cursor s, Op f)
 //]
 {
     Cursor t = s;
@@ -182,7 +176,7 @@
  * @result    A cursor past t's postorder end, after the copying operation.
  */
 template <class InCursor, class OutCursor>
-OutCursor copy(postorder(), InCursor s, OutCursor t)
+OutCursor copy(postorder, InCursor s, OutCursor t)
 {
     InCursor r = s;
     s.to_begin();
@@ -217,7 +211,7 @@
  * op must not change its argument.
  */
 template <class InCursor, class OutCursor, class Op>
-OutCursor transform(postorder(), InCursor s, OutCursor t, Op op)
+OutCursor transform(postorder, InCursor s, OutCursor t, Op op)
 {
     InCursor r = s;
     s.to_begin();

Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/preorder.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/preorder.hpp	(original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/cursor/preorder.hpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -14,10 +14,6 @@
 #ifndef BOOST_TREE_DETAIL_ALGORITHM_CURSOR_PREORDER_HPP
 #define BOOST_TREE_DETAIL_ALGORITHM_CURSOR_PREORDER_HPP
 
-//#ifdef BOOST_RECURSIVE_ORDER_ALGORITHMS
-#include <boost/tree/detail/algorithm/cursor/common.hpp>
-//#endif
-
 #include <boost/tree/root_tracking_cursor.hpp>
 #include <boost/tree/ascending_cursor.hpp>
 

Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/iterator.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/iterator.hpp	(original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/algorithm/iterator.hpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -17,10 +17,6 @@
 #include <boost/tree/detail/iterator/iterator.hpp>
 #include <boost/tree/detail/algorithm/cursor.hpp>
 
-//#include <boost/iterator/iterator_adaptor.hpp>
-//#include <boost/type_traits/is_convertible.hpp>
-//#include <boost/utility/enable_if.hpp>
-
 namespace boost {
 namespace tree {
 

Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp	(original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -107,5 +107,6 @@
 {
     test_forest_tree();
     test_natural_correspondence();
+
     return 0;
 }

Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp	(original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp	2008-09-29 17:05:42 EDT (Mon, 29 Sep 2008)
@@ -152,7 +152,7 @@
 //        boost::lambda::bind(&std::list<int>::push_back, &test_list, boost::lambda::_1)
 //    );
 //    BOOST_CHECK(test_list.empty());
-    
+
     create_test_data_tree(test_tree);
 
     //Preorder