Changes introduced by the new intrusive version.

[SVN r39550]

example/doc_set.cpp

@@ -17,7 +17,7 @@
 using namespace boost::intrusive;
 
                   //This is a base hook
-class MyClass  :  public set_base_hook<>
+class MyClass : public set_base_hook<>
 {
    int int_;
 
@@ -28,69 +28,54 @@ class MyClass  :  public set_base_hook<>
    MyClass(int i)
       :  int_(i)
       {}
-   int get() const
-      {  return int_;  }
    friend bool operator< (const MyClass &a, const MyClass &b)
-      {  return a.get() < b.get();  }
+      {  return a.int_ < b.int_;  }
    friend bool operator> (const MyClass &a, const MyClass &b)
-      {  return a.get() > b.get();  }
+      {  return a.int_ > b.int_;  }
    friend bool operator== (const MyClass &a, const MyClass &b)
-      {  return a.get() < b.get();  }
+      {  return a.int_ < b.int_;  }
 };
 
-//Define an set that will store MyClass
-//in reverse order using the public base hook
-typedef set< set_base_hook<>::value_traits<MyClass>
-           , std::greater<MyClass> >     BaseSet;
+//Define an set using the base hook that will store values in reverse order
+typedef set< MyClass, compare<std::greater<MyClass> > >     BaseSet;
 
-//Define an multiset that will store MyClass
-//using the public member hook
-typedef multiset< set_member_hook<>::
-                     value_traits<MyClass, &MyClass::member_hook_>
-                , std::less<MyClass> >   MemberIMultiset;
+//Define an multiset using the member hook
+typedef member_hook<MyClass, set_member_hook<>, &MyClass::member_hook_> MemberOption;
+typedef multiset< MyClass, MemberOption>   MemberIMultiset;
 
 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));
 
    BaseSet baseset;
    MemberIMultiset membermultiset;
 
-   //Now insert them in the reverse order
-   //in the base hook intrusive set
-   for(VectIt it(myclassvector.begin()), itend(myclassvector.end())
-      ; it != itend; ++it)
+   //Now insert them in the reverse order in the base hook set
+   for(VectIt it(values.begin()), itend(values.end()); it != itend; ++it)
       baseset.insert(*it);
 
-   //Now insert them in the same order as in vector in the
-   //member hook intrusive set
-   for(VectIt it(myclassvector.begin()), itend(myclassvector.end())
-      ; it != itend; ++it)
+   //Now insert them in the same order as in vector in the member hook set
+   for(VectIt it(values.begin()), itend(values.end()); it != itend; ++it)
       membermultiset.insert(*it);
 
    //Now test sets
    {
       BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend());
       MemberIMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end());
-      VectIt it(myclassvector.begin()), itend(myclassvector.end());
+      VectIt it(values.begin()), itend(values.end());
 
       //Test the objects inserted in the base hook set
-      for(; it != itend; ++it, ++rbit){
+      for(; it != itend; ++it, ++rbit)
          if(&*rbit != &*it)   return 1;
-      }
 
       //Test the objects inserted in the member hook set
-      for(it = myclassvector.begin(); it != itend; ++it, ++mit){
+      for(it = values.begin(); it != itend; ++it, ++mit)
          if(&*mit != &*it) return 1;
-      }
    }
    return 0;
 }