Reverted git mess.

example/doc_splay_set.cpp

@@ -11,7 +11,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //[doc_splay_set_code
 #include <boost/intrusive/splay_set.hpp>
-#include <boost/intrusive/bs_set_hook.hpp>
 #include <vector>
 #include <algorithm>
 
@@ -20,14 +19,13 @@ using namespace boost::intrusive;
 class mytag;
 
 class MyClass
-   : public splay_set_base_hook<>            //This is an splay tree base hook
-   , public bs_set_base_hook< tag<mytag> >   //This is a binary search tree base hook
+   : public bs_set_base_hook<>
 {
    int int_;
 
    public:
    //This is a member hook
-   splay_set_member_hook<> member_hook_;
+   bs_set_member_hook<> member_hook_;
 
    MyClass(int i)
       :  int_(i)
@@ -43,11 +41,8 @@ class MyClass
 //Define a set using the base hook that will store values in reverse order
 typedef splay_set< MyClass, compare<std::greater<MyClass> > >     BaseSplaySet;
 
-//Define a set using the binary search tree hook
-typedef splay_set< MyClass, base_hook<bs_set_base_hook< tag<mytag> > > >      BaseBsSplaySet;
-
 //Define an multiset using the member hook
-typedef member_hook<MyClass, splay_set_member_hook<>, &MyClass::member_hook_> MemberOption;
+typedef member_hook<MyClass, bs_set_member_hook<>, &MyClass::member_hook_> MemberOption;
 typedef splay_multiset< MyClass, MemberOption>   MemberSplayMultiset;
 
 int main()
@@ -59,21 +54,18 @@ int main()
    for(int i = 0; i < 100; ++i)  values.push_back(MyClass(i));
 
    BaseSplaySet   baseset;
-   BaseBsSplaySet bsbaseset;
    MemberSplayMultiset membermultiset;
 
 
    //Insert values in the container
    for(VectIt it(values.begin()), itend(values.end()); it != itend; ++it){
       baseset.insert(*it);
-      bsbaseset.insert(*it);
       membermultiset.insert(*it);
    }
 
    //Now test sets
    {
       BaseSplaySet::reverse_iterator rbit(baseset.rbegin());
-      BaseBsSplaySet::iterator bsit(bsbaseset.begin());
       MemberSplayMultiset::iterator mit(membermultiset.begin());
       VectIt it(values.begin()), itend(values.end());
 
@@ -83,8 +75,7 @@ int main()
       }
 
       //Test the objects inserted in member and binary search hook sets
-      for(it = values.begin(); it != itend; ++it, ++bsit, ++mit){
-         if(&*bsit != &*it)   return 1;
+      for(it = values.begin(); it != itend; ++it, ++mit){
          if(&*mit != &*it)    return 1;
       }
    }