Changes introduced by the new intrusive version.

[SVN r39550]

example/doc_slist.cpp

@@ -16,7 +16,7 @@
 using namespace boost::intrusive;
 
                   //This is a base hook
-class MyClass  :  public slist_base_hook<>
+class MyClass : public slist_base_hook<>
 {
    int int_;
 
@@ -27,45 +27,34 @@ class MyClass  :  public slist_base_hook<>
    MyClass(int i)
       :  int_(i)
    {}
-
-   int get() const
-   {  return int_;  }
 };
 
 //Define an slist that will store MyClass using the public base hook
-typedef slist< slist_base_hook<>::value_traits<MyClass> > BaseList;
+typedef slist<MyClass> BaseList;
 
 //Define an slist that will store MyClass using the public member hook
-typedef slist< slist_member_hook<>::value_traits<MyClass, &MyClass::member_hook_> > MemberList;
+typedef member_hook<MyClass, slist_member_hook<>, &MyClass::member_hook_> MemberOption;
+typedef slist<MyClass, MemberOption> MemberList;
 
 int main()
 {
-   typedef std::vector<MyClass> Vect;
-   typedef Vect::iterator VectIt;
-   typedef Vect::reverse_iterator VectRit;
+   typedef std::vector<MyClass>::iterator VectIt;
+   typedef std::vector<MyClass>::reverse_iterator VectRit;
 
-   //Create several MyClass objects, each one
-   //with a different internal number
-   Vect myclassvector;
-   for(int i = 0; i < 100; ++i)
-      myclassvector.push_back(MyClass(i));
+   //Create several MyClass objects, each one with a different value
+   std::vector<MyClass> values;
+   for(int i = 0; i < 100; ++i)  values.push_back(MyClass(i));
 
    BaseList baselist;
    MemberList memberlist;
 
-   //Now insert them in the reverse order
-   //in the base hook intrusive list
-   for(VectIt it(myclassvector.begin()), itend(myclassvector.end())
-      ; it != itend
-      ; ++it){
+   //Now insert them in the reverse order in the base hook list
+   for(VectIt it(values.begin()), itend(values.end()); it != itend; ++it)
       baselist.push_front(*it);
-   }
 
-   //Now insert them in the same order as in vector in the
-   //member hook intrusive list
+   //Now insert them in the same order as in vector in the member hook list
    for(BaseList::iterator it(baselist.begin()), itend(baselist.end())
-      ; it != itend
-      ; ++it){
+      ; it != itend; ++it){
       memberlist.push_front(*it);
    }
 
@@ -73,18 +62,16 @@ int main()
    {
       BaseList::iterator bit(baselist.begin()), bitend(baselist.end());
       MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end());
-      VectRit rit(myclassvector.rbegin()), ritend(myclassvector.rend());
-      VectIt  it(myclassvector.begin()), itend(myclassvector.end());
+      VectRit rit(values.rbegin()), ritend(values.rend());
+      VectIt  it(values.begin()), itend(values.end());
 
       //Test the objects inserted in the base hook list
-      for(; rit != ritend; ++rit, ++bit){
+      for(; rit != ritend; ++rit, ++bit)
          if(&*bit != &*rit)   return 1;
-      }
 
       //Test the objects inserted in the member hook list
-      for(; it != itend; ++it, ++mit){
+      for(; it != itend; ++it, ++mit)
          if(&*mit != &*it)    return 1;
-      }
    }
 
    return 0;