From 86d7b3ef6e46b9bb01fb6e78ecc47146cf604362 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Wed, 25 Dec 2013 12:36:32 +0100 Subject: [PATCH] copied content from develop after wrongly made merge --- doc/acknowledgements.html | 11 +- doc/compiler_specifics.html | 8 +- doc/index.html | 12 +- doc/reference/hash_indices.html | 136 ++- doc/reference/multi_index_container.html | 44 +- doc/reference/ord_indices.html | 38 +- doc/reference/rnd_indices.html | 45 +- doc/reference/seq_indices.html | 41 +- doc/release_notes.html | 43 +- example/basic.cpp | 7 +- example/composite_keys.cpp | 14 +- include/boost/multi_index/composite_key.hpp | 64 +- .../multi_index/detail/access_specifier.hpp | 7 +- include/boost/multi_index/detail/adl_swap.hpp | 4 +- .../detail/archive_constructed.hpp | 4 +- .../boost/multi_index/detail/auto_space.hpp | 12 +- .../boost/multi_index/detail/base_type.hpp | 17 +- .../detail/bidir_node_iterator.hpp | 4 +- .../boost/multi_index/detail/bucket_array.hpp | 189 ++-- .../boost/multi_index/detail/converter.hpp | 4 +- include/boost/multi_index/detail/copy_map.hpp | 29 +- .../detail/do_not_copy_elements_tag.hpp | 2 +- .../detail/duplicates_iterator.hpp | 4 +- include/boost/multi_index/detail/has_tag.hpp | 4 +- .../multi_index/detail/hash_index_args.hpp | 4 +- .../detail/hash_index_iterator.hpp | 86 +- .../multi_index/detail/hash_index_node.hpp | 700 +++++++++++-- .../multi_index/detail/header_holder.hpp | 2 +- .../boost/multi_index/detail/index_base.hpp | 63 +- .../boost/multi_index/detail/index_loader.hpp | 4 +- .../multi_index/detail/index_matcher.hpp | 2 +- .../multi_index/detail/index_node_base.hpp | 8 +- .../boost/multi_index/detail/index_saver.hpp | 4 +- .../multi_index/detail/invariant_assert.hpp | 4 +- .../multi_index/detail/is_index_list.hpp | 4 +- .../boost/multi_index/detail/iter_adaptor.hpp | 14 +- .../multi_index/detail/modify_key_adaptor.hpp | 4 +- .../detail/msvc_index_specifier.hpp | 69 -- .../multi_index/detail/no_duplicate_tags.hpp | 4 +- .../boost/multi_index/detail/node_type.hpp | 17 +- .../multi_index/detail/ord_index_args.hpp | 4 +- .../multi_index/detail/ord_index_node.hpp | 66 +- .../multi_index/detail/ord_index_ops.hpp | 4 +- .../boost/multi_index/detail/prevent_eti.hpp | 60 -- .../multi_index/detail/rnd_index_loader.hpp | 33 +- .../multi_index/detail/rnd_index_node.hpp | 65 +- .../multi_index/detail/rnd_index_ops.hpp | 16 +- .../detail/rnd_index_ptr_array.hpp | 35 +- .../multi_index/detail/rnd_node_iterator.hpp | 4 +- .../multi_index/detail/safe_ctr_proxy.hpp | 105 -- .../boost/multi_index/detail/safe_mode.hpp | 16 +- .../boost/multi_index/detail/scope_guard.hpp | 2 +- .../multi_index/detail/seq_index_node.hpp | 55 +- .../multi_index/detail/seq_index_ops.hpp | 7 +- .../detail/serialization_version.hpp | 6 +- .../boost/multi_index/detail/uintptr_type.hpp | 4 +- .../boost/multi_index/detail/unbounded.hpp | 21 +- .../multi_index/detail/value_compare.hpp | 4 +- .../multi_index/detail/vartempl_support.hpp | 2 +- include/boost/multi_index/global_fun.hpp | 19 +- include/boost/multi_index/hashed_index.hpp | 961 +++++++++++------- .../boost/multi_index/hashed_index_fwd.hpp | 20 +- include/boost/multi_index/identity.hpp | 20 +- include/boost/multi_index/identity_fwd.hpp | 4 +- include/boost/multi_index/indexed_by.hpp | 8 +- include/boost/multi_index/key_extractors.hpp | 4 +- include/boost/multi_index/mem_fun.hpp | 27 +- include/boost/multi_index/member.hpp | 29 +- include/boost/multi_index/ordered_index.hpp | 98 +- .../boost/multi_index/ordered_index_fwd.hpp | 4 +- .../boost/multi_index/random_access_index.hpp | 91 +- .../multi_index/random_access_index_fwd.hpp | 4 +- .../boost/multi_index/safe_mode_errors.hpp | 4 +- include/boost/multi_index/sequenced_index.hpp | 89 +- .../boost/multi_index/sequenced_index_fwd.hpp | 4 +- include/boost/multi_index/tag.hpp | 8 +- include/boost/multi_index_container.hpp | 235 ++--- include/boost/multi_index_container_fwd.hpp | 4 +- perf/test_perf.cpp | 34 +- test/test_comparison.cpp | 40 +- test/test_composite_key.cpp | 123 +-- test/test_copy_assignment.cpp | 12 +- test/test_hash_ops.cpp | 25 + test/test_key_extractors.cpp | 6 - test/test_list_ops.cpp | 66 +- test/test_rearrange.cpp | 7 +- test/test_safe_mode.cpp | 21 +- test/test_serialization3.cpp | 10 +- test/test_update.cpp | 65 +- 89 files changed, 2332 insertions(+), 1951 deletions(-) delete mode 100644 include/boost/multi_index/detail/msvc_index_specifier.hpp delete mode 100644 include/boost/multi_index/detail/prevent_eti.hpp delete mode 100644 include/boost/multi_index/detail/safe_ctr_proxy.hpp diff --git a/doc/acknowledgements.html b/doc/acknowledgements.html index 65dbf55..74f014a 100644 --- a/doc/acknowledgements.html +++ b/doc/acknowledgements.html @@ -172,6 +172,13 @@ hashed indices update functions so that they meet some intuitive expectation Grzegorz Jakacki spotted some internal dead code.

+

Boost 1.56 release

+ +

+Stephen Kelly has contributed the removal of workaround code for old compilers +no longer supported. +

+
release notes
@@ -185,9 +192,9 @@ Index
-

Revised June 25th 2008

+

Revised October 9th 2013

-

© Copyright 2003-2008 Joaquín M López Muñoz. +

© Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/doc/compiler_specifics.html b/doc/compiler_specifics.html index 3a3c2f5..ca35509 100644 --- a/doc/compiler_specifics.html +++ b/doc/compiler_specifics.html @@ -114,25 +114,21 @@ of symbol names. class template limiting macro default value - default value
(MSVC++ 6.0)  indexed_by   BOOST_MULTI_INDEX_LIMIT_INDEXED_BY_SIZE  20 - 5  tag   BOOST_MULTI_INDEX_LIMIT_TAG_SIZE  20 - 3  composite_key   BOOST_MULTI_INDEX_LIMIT_COMPOSITE_KEY_SIZE  10 - 5

@@ -198,7 +194,7 @@ in the final type by encapsulating it into another, shorter-named construct: 
 // reducing symbol names through type hiding
-// type hide the index spexifier list within employee_set_indices
+// type hide the index specifier list within employee_set_indices
 
 struct employee_set_indices:
   indexed_by<
@@ -372,7 +368,7 @@ Performance
 
 

 
-
Revised July 30th 2013

+
Revised November 12th 2013

 
 
© Copyright 2003-2013 Joaquín M López Muñoz.
 Distributed under the Boost Software 
diff --git a/doc/index.html b/doc/index.html
index 32363aa..4e89487 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -13,8 +13,8 @@
 
boost.png (6897 bytes)Boost Multi-index Containers Library

 
-

-

+
 

+
 

 
tutorial

 Tutorial
 


@@ -77,17 +77,17 @@ examples of use developed in the documentation:
 
 

 
-

-

+
 

+
 

 
tutorial

 Tutorial
 


 
 

 
-
Revised February 6th 2006

+
Revised November 30th 2013

 
-
© Copyright 2003-2006 Joaquín M López Muñoz.
+
© Copyright 2003-2013 Joaquín M López Muñoz.
 Distributed under the Boost Software 
 License, Version 1.0. (See accompanying file 
 LICENSE_1_0.txt or copy at 
diff --git a/doc/reference/hash_indices.html b/doc/reference/hash_indices.html
index b8e1985..a0407f3 100644
--- a/doc/reference/hash_indices.html
+++ b/doc/reference/hash_indices.html
@@ -50,6 +50,7 @@ Sequenced indices
           
  • Lookup
    • 
           
  • Bucket interface
    • 
           
  • Hash policy
    • 
+          
  • Comparison
    • 
           
  • Serialization
    • 
         
       
@@ -118,6 +119,13 @@ their associated hashed index classes.
 
 template<implementation defined> class index class name implementation defined;
 
+// index comparison:
+
+// OP is any of ==,!=
+
+template<implementation defined>
+bool operator OP(const index class name& x,const index class name& y);
+
 // index specialized algorithms:
 
 template<implementation defined>
@@ -238,20 +246,20 @@ requirements.
   index class name& operator=(const index class name& x);
   index class name& operator=(std::initializer_list<value_type> list);
 
-  allocator_type get_allocator()const;
+  allocator_type get_allocator()const noexcept;
 
   // size and capacity:
 
-  bool      empty()const;
-  size_type size()const;
-  size_type max_size()const;
+  bool      empty()const noexcept;
+  size_type size()const noexcept;
+  size_type max_size()const noexcept;
 
   // iterators:
 
-  iterator       begin();
-  const_iterator begin()const;
-  iterator       end();
-  const_iterator end()const;
+  iterator       begin()noexcept;
+  const_iterator begin()const noexcept;
+  iterator       end()noexcept;
+  const_iterator end()const noexcept;
   const_iterator cbegin()const;
   const_iterator cend()const;
  
@@ -286,7 +294,7 @@ requirements.
   template<typename Modifier,typename Rollback>
   bool modify_key(iterator position,Modifier mod,Rollback back);
   
-  void clear();
+  void clear()noexcept;
   void swap(index class name& x);
 
   // observers:
@@ -326,8 +334,8 @@ requirements.
 
   // bucket interface:
 
-  size_type bucket_count()const;
-  size_type max_bucket_count()const;
+  size_type bucket_count()const noexcept;
+  size_type max_bucket_count()const noexcept;
   size_type bucket_size(size_type n)const;
   size_type bucket(const key_type& k)const;
 
@@ -343,12 +351,24 @@ requirements.
 
   // hash policy:
 
-  float load_factor()const;
-  float max_load_factor()const;
+  float load_factor()const noexcept;
+  float max_load_factor()const noexcept;
   void  max_load_factor(float z);
   void  rehash(size_type n);
+  void  reserve(size_type n);
 };
 
+// index comparison:
+
+template<implementation defined>
+bool operator==(const index class name& x,const index class name& y);
+
+template<implementation defined>
+bool operator!=(const index class name& x,const index class name& y)
+{
+  return !(x==y);
+}
+
 // index specialized algorithms:
 
 template<implementation defined>
@@ -370,21 +390,22 @@ scheme outlined in the
 section. The complexity signature of hashed indices is:
 
      
   
    • copying: c(n)=n*log(n),
      • 
-  
    • insertion: average case i(n)=1 (constant),
-    worst case i(n)=n,
      • 
-  
    • hinted insertion: average case h(n)=1 (constant),
-    worst case h(n)=n,
      • 
-  
    • deletion: average case d(n)=1 (constant),
-    worst case d(n)=n,
      • 
+  
    • insertion: average case i(n)=1 (amortized constant),
+    worst case i(n)=ndist,
      • 
+  
    • hinted insertion: average case h(n)=1 (amortized constant),
+    worst case h(n)=ndist,
      • 
+  
    • deletion: d(n)=1 (constant),
      • 
   
    • replacement:
     
        
       
      • if the new element key is equivalent to the original, r(n)=1 (constant),
        • 
       
      • otherwise, average case r(n)=1 (constant),
-        worst case r(n)=n,
        • 
+        worst case r(n)=ndist,
     
      • 
   
    • modifying: average case m(n)=1 (constant),
-    worst case m(n)=n.
      • 
+    worst case m(n)=ndist,
 
    
+where ndist is the number of non-equivalent elements out of
+the total n.
 
    
 
 
    Instantiation types
    
@@ -504,7 +525,7 @@ is true if and only if insertion took place. On successful insertio
 points to an element that caused the insertion to be banned. Note that more than
 one element can be causing insertion not to be allowed.
    
 Complexity: O(I(n)).
    
-Exception safety: Strong.
    
+Exception safety: Strong, except that rehashing may occur even if the operation fails.
    template<typename... Args>
    @@ -530,7 +551,7 @@ element. Otherwise, an iterator to an element that caused the insertion to be banned. Note that more than one element can be causing insertion not to be allowed.
    Complexity: O(H(n)).
    -Exception safety: Strong.
    +Exception safety: Strong, except that rehashing may occur even if the operation fails.
    std::pair<iterator,bool> insert(const value_type& x);
    @@ -555,7 +576,7 @@ is true if and only if insertion took place. On successful insertio points to an element that caused the insertion to be banned. Note that more than one element can be causing insertion not to be allowed.
    Complexity: O(I(n)).
    -Exception safety: Strong.
    +Exception safety: Strong, except that rehashing may occur even if the operation fails.
    iterator insert(iterator position,const value_type& x);
    @@ -583,7 +604,7 @@ element. Otherwise, an iterator to an element that caused the insertion to be banned. Note that more than one element can be causing insertion not to be allowed.
    Complexity: O(H(n)).
    -Exception safety: Strong.
    +Exception safety: Strong, except that rehashing may occur even if the operation fails.
    template<typename InputIterator>
    @@ -618,7 +639,7 @@ to which this index belongs if
    Effects: 
    -insert(list.begin(),list.end())
+insert(list.begin(),list.end());
    @@ -641,7 +662,7 @@ if no such element exists.
    Effects: Deletes the elements with key equivalent to x.
    Returns: Number of elements deleted.
    Complexity: Average case, O(1 + m*D(n)), worst case -O(n + m*D(n)), where m is +O(ndist + m*D(n)), where m is the number of elements deleted.
    Exception safety: Basic.
    @@ -870,7 +891,7 @@ In the context of a compatible extension or a compatible key, the expression Effects: Returns a pointer to an element whose key is equivalent to x, or end() if such an element does not exist.
    Complexity: Average case O(1) (constant), worst case -O(n).
    +O(ndist).
    template<
    @@ -888,7 +909,7 @@ iterator find(
    Effects: Returns a pointer to an element whose key is equivalent to x, or end() if such an element does not exist.
    Complexity: Average case O(1) (constant), worst case -O(n).
    +O(ndist).
    template<typename CompatibleKey>
    @@ -900,7 +921,7 @@ size_type count(const CompatibleKey& x)const; (hasher, key_equal).
    Effects: Returns the number of elements with key equivalent to x.
    Complexity: Average case O(count(x)), worst case -O(n).
    +O(count(x)+ndist).
    template<
    @@ -917,7 +938,7 @@ size_type count(
    (hasher, key_equal).
    Effects: Returns the number of elements with key equivalent to x.
    Complexity: Average case O(count(x,hash,eq)), worst case -O(n).
    +O(count(x,hash,eq)+ndist).
    template<typename CompatibleKey>
    @@ -930,8 +951,8 @@ std::pair<iterator,iterator> equal_range(const CompatibleKey& x)const; Effects: Returns a range containing all elements with keys equivalent to x (and only those), or (end(),end()) if no such elements exist.
    -Complexity: Average case O(count(x)), worst case -O(n).
    +Complexity: Average case O(1) (constant), worst case +O(ndist).
    template<
    @@ -949,8 +970,8 @@ std::pair<iterator,iterator> equal_range(
    Effects: Returns a range containing all elements with keys equivalent to x (and only those), or (end(),end()) if no such elements exist.
    -Complexity: Average case O(count(x,hash,eq)), worst case -O(n).
    +Complexity: Average case O(1) (constant), worst case +O(ndist).

    Bucket interface

    @@ -976,11 +997,50 @@ so that size()/bucket_count() does not exceed the maximum load factor, and bucket_count()>=n.
    Postconditions: Validity of iterators and references to the elements contained is preserved.
    -Complexity: Average case O(size()), worst case -O(size(n)2).
    +Complexity: O(m), where m is the number of +non-equivalent elements in the index.
    Exception safety: Strong. +void reserve(size_type n); + +
    +Effects: +
    +rehash(std::ceil(n/max_load_factor()));
+
    +
    + +

    Comparison

    + +template<implementation defined>
    +bool operator==(const index class name& x,const index class name& y);     + +
    +Requires: x.key_extractor(), x.hash_function() and +x.key_eq() have the same behavior as the corresponding objects in y. +For any two elements e1, e2 in x or y, +if e1==e2 then their keys are equivalent.
    +Returns: true iff x and y have the same size +and for each key k present in x the range +x.equal_range(k) is equal (considering the == operator of value_type) +to y.equal_range(k) under permutations of the elements.
    +Complexity: Let k1,...,km be the different +keys present in x:
    +
      +
    • If, for each ki, x.equal_range(ki) is arranged + in the same order as y.equal_range(ki), average case is + O(x.size()), worst case O(x.size()2). +
      • +
    • Otherwise, average case is + O(Σ(x.count(ki)2)), + worst case O(x.size()2). +
      • +
    +(For unique indices, the formulas above reduce to average case +O(x.size()), worst case O(x.size()2).) +
    +

    Serialization

    @@ -1069,7 +1129,7 @@ Sequenced indices
    -

    Revised July 6th 2013

    +

    Revised November 30th 2013

    © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/doc/reference/multi_index_container.html b/doc/reference/multi_index_container.html index e4e294f..f1d0235 100644 --- a/doc/reference/multi_index_container.html +++ b/doc/reference/multi_index_container.html @@ -119,7 +119,7 @@ synopsis typename nth_index< multi_index_container<Value,IndexSpecifierList,Allocator>,N >::type& -get(multi_index_container<Value,IndexSpecifierList,Allocator>& m); +get(multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept; template< int N,typename Value,typename IndexSpecifierList,typename Allocator @@ -127,7 +127,7 @@ synopsis const typename nth_index< multi_index_container<Value,IndexSpecifierList,Allocator>,N >::type& -get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m); +get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept; template< typename Tag,typename Value,typename IndexSpecifierList,typename Allocator @@ -135,7 +135,7 @@ synopsis typename index< multi_index_container<Value,IndexSpecifierList,Allocator>,Tag >::type& -get(multi_index_container<Value,IndexSpecifierList,Allocator>& m); +get(multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept; template< typename Tag,typename Value,typename IndexSpecifierList,typename Allocator @@ -143,7 +143,7 @@ synopsis const typename index< multi_index_container<Value,IndexSpecifierList,Allocator>,Tag >::type& -get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m); +get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept; // multi_index_container global functions for projection of iterators: @@ -314,14 +314,14 @@ operators and functions associated with the index (vg. comparison and multi_index_container<Value,IndexSpecifierList,Allocator>& operator=( std::initializer_list<Value> list) - allocator_type get_allocator()const; + allocator_type get_allocator()const noexcept; // retrieval of indices - template<int N> typename nth_index<N>::type& get(); - template<int N> const typename nth_index<N>::type& get()const; - template<typename Tag> typename index<Tag>::type& get() - template<typename Tag> const typename index<Tag>::type& get()const; + template<int N> typename nth_index<N>::type& get()noexcept; + template<int N> const typename nth_index<N>::type& get()const noexcept; + template<typename Tag> typename index<Tag>::type& get()noexcept; + template<typename Tag> const typename index<Tag>::type& get()const noexcept; // projection of iterators @@ -379,7 +379,7 @@ operators and functions associated with the index (vg. comparison and typename nth_index< multi_index_container<Value,IndexSpecifierList,Allocator>,N >::type& -get(multi_index_container<Value,IndexSpecifierList,Allocator>& m) +get(multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept { return m.get<N>(); } @@ -390,7 +390,7 @@ operators and functions associated with the index (vg. comparison and const typename nth_index< multi_index_container<Value,IndexSpecifierList,Allocator>,N >::type& -get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m) +get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept { return m.get<N>(); } @@ -401,7 +401,7 @@ operators and functions associated with the index (vg. comparison and typename index< multi_index_container<Value,IndexSpecifierList,Allocator>,Tag >::type& -get(multi_index_container<Value,IndexSpecifierList,Allocator>& m) +get(multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept { return m.get<Tag>(); } @@ -412,7 +412,7 @@ operators and functions associated with the index (vg. comparison and const typename index< multi_index_container<Value,IndexSpecifierList,Allocator>,Tag >::type& -get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m) +get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m)noexcept { return m.get<Tag>(); } @@ -537,7 +537,7 @@ scheme outlined in the

    • Non-equal allocator instances are supported: swapping two non-equal instances must not throw any exception. -
      • s +
    • For every type T, the type Allocator::rebind<T>::other::pointer can be any kind of random access iterator, provided that it is explicitly constructible from @@ -804,7 +804,7 @@ number of elements of list.
      of the types of ctor_args_list do not throw. -allocator_type get_allocator()const; +allocator_type get_allocator()const noexcept;
      Returns a copy of the allocator_type object used to construct @@ -814,27 +814,25 @@ the multi_index_container.

      Index retrieval operations

      -template<int N> typename nth_index<N>::type& get(); +template<int N> typename nth_index<N>::type& get()noexcept;
      Requires: 0 <= N < I.
      Effects: Returns a reference to the nth_index<N>::type index held by *this.
      Complexity: Constant.
      -Exception safety: nothrow.
      -template<int N> const typename nth_index<N>::type& get()const; +template<int N> const typename nth_index<N>::type& get()const noexcept;
      Requires: 0 <= N < I.
      Effects: Returns a const reference to the nth_index<N>::type index held by *this.
      Complexity: Constant.
      -Exception safety: nothrow.
      -template<typename Tag> typename index<Tag>::type& get() +template<typename Tag> typename index<Tag>::type& get()noexcept;
      Requires: Tag is such that index<Tag>::type @@ -843,10 +841,9 @@ is valid.
      index<Tag>::type index held by *this.
      Complexity: Constant.
      -Exception safety: nothrow.
      -template<typename Tag> const typename index<Tag>::type& get()const; +template<typename Tag> const typename index<Tag>::type& get()const noexcept;
      Requires: Tag is such that index<Tag>::type @@ -855,7 +852,6 @@ is valid.
      index<Tag>::type index held by *this.
      Complexity: Constant.
      -Exception safety: nothrow.

      Projection operations

      @@ -996,7 +992,7 @@ Index reference
      -

      Revised July 3rd 2013

      +

      Revised October 12th 2013

      © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/doc/reference/ord_indices.html b/doc/reference/ord_indices.html index de74590..bd21f91 100644 --- a/doc/reference/ord_indices.html +++ b/doc/reference/ord_indices.html @@ -243,31 +243,31 @@ do not exactly conform to or are not mandated by the standard requirements. index class name& operator=(const index class name& x); index class name& operator=(std::initializer_list<value_type> list); - allocator_type get_allocator()const; + allocator_type get_allocator()const noexcept; // iterators: - iterator begin(); - const_iterator begin()const; - iterator end(); - const_iterator end()const; - reverse_iterator rbegin(); - const_reverse_iterator rbegin()const; - reverse_iterator rend(); - const_reverse_iterator rend()const; - const_iterator cbegin()const; - const_iterator cend()const; - const_reverse_iterator crbegin()const; - const_reverse_iterator crend()const; + iterator begin()noexcept; + const_iterator begin()const noexcept; + iterator end()noexcept; + const_iterator end()const noexcept; + reverse_iterator rbegin()noexcept; + const_reverse_iterator rbegin()const noexcept; + reverse_iterator rend()noexcept; + const_reverse_iterator rend()const noexcept; + const_iterator cbegin()const noexcept; + const_iterator cend()const noexcept; + const_reverse_iterator crbegin()const noexcept; + const_reverse_iterator crend()const noexcept; iterator iterator_to(const value_type& x); const_iterator iterator_to(const value_type& x)const; // capacity: - bool empty()const; - size_type size()const; - size_type max_size()const; + bool empty()const noexcept; + size_type size()const noexcept; + size_type max_size()const noexcept; // modifiers: @@ -297,7 +297,7 @@ do not exactly conform to or are not mandated by the standard requirements. bool modify_key(iterator position,Modifier mod,Rollback back); void swap(index class name& x); - void clear(); + void clear()noexcept; // observers: @@ -631,7 +631,7 @@ to which this index belongs if

      Effects: 
      -insert(list.begin(),list.end())
+insert(list.begin(),list.end());
      @@ -1103,7 +1103,7 @@ Hashed indices
      -

      Revised July 6th 2013

      +

      Revised October 12th 2013

      © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/doc/reference/rnd_indices.html b/doc/reference/rnd_indices.html index 0e2dd7b..7ed5d15 100644 --- a/doc/reference/rnd_indices.html +++ b/doc/reference/rnd_indices.html @@ -230,32 +230,32 @@ plus the requirements for std::list specific list operations at void assign(std::initializer_list<value_type> list) void assign(size_type n,const value_type& value); - allocator_type get_allocator()const; + allocator_type get_allocator()const noexcept; // iterators: - iterator begin(); - const_iterator begin()const; - iterator end(); - const_iterator end()const; - reverse_iterator rbegin(); - const_reverse_iterator rbegin()const; - reverse_iterator rend(); - const_reverse_iterator rend()const; - const_iterator cbegin()const; - const_iterator cend()const; - const_reverse_iterator crbegin()const; - const_reverse_iterator crend()const; + iterator begin()noexcept; + const_iterator begin()const noexcept; + iterator end()noexcept; + const_iterator end()const noexcept; + reverse_iterator rbegin()noexcept; + const_reverse_iterator rbegin()const noexcept; + reverse_iterator rend()noexcept; + const_reverse_iterator rend()const noexcept; + const_iterator cbegin()const noexcept; + const_iterator cend()const noexcept; + const_reverse_iterator crbegin()const noexcept; + const_reverse_iterator crend()const noexcept; iterator iterator_to(const value_type& x); const_iterator iterator_to(const value_type& x)const; // capacity: - bool empty()const; - size_type size()const; - size_type max_size()const; - size_type capacity()const; + bool empty()const noexcept; + size_type size()const noexcept; + size_type max_size()const noexcept; + size_type capacity()const noexcept; void reserve(size_type m); void shrink_to_fit(); @@ -303,7 +303,7 @@ plus the requirements for std::list specific list operations at void swap(index class name& x); - void clear(); + void clear()noexcept; // list operations: @@ -325,7 +325,7 @@ plus the requirements for std::list specific list operations at void sort(); template <typename Compare> void sort(Compare comp); - void reverse(); + void reverse()noexcept; // rearrange operations: @@ -517,7 +517,7 @@ const_iterator iterator_to(const value_type& x)const;

      Capacity operations

      -size_type capacity()const; +size_type capacity()const noexcept;
      Returns: The total number of elements c such that, when @@ -987,13 +987,12 @@ is stable, i.e. equivalent elements preserve their relative position.
      Exception safety: Basic.
      -void reverse(); +void reverse()noexcept;
      Effects: Reverses the order of the elements in the index.
      Postconditions: Validity of iterators and references is preserved.
      Complexity: O(n).
      -Exception safety: nothrow.

      Rearrange operations

      @@ -1108,7 +1107,7 @@ Key extraction
      -

      Revised July 14th 2013

      +

      Revised October 12th 2013

      © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/doc/reference/seq_indices.html b/doc/reference/seq_indices.html index b9c93b5..4c3c7ed 100644 --- a/doc/reference/seq_indices.html +++ b/doc/reference/seq_indices.html @@ -218,31 +218,31 @@ most important differences are: void assign(std::initializer_list<value_type> list); void assign(size_type n,const value_type& value); - allocator_type get_allocator()const; + allocator_type get_allocator()const noexcept; // iterators: - iterator begin(); - const_iterator begin()const; - iterator end(); - const_iterator end()const; - reverse_iterator rbegin(); - const_reverse_iterator rbegin()const; - reverse_iterator rend(); - const_reverse_iterator rend()const; - const_iterator cbegin()const; - const_iterator cend()const; - const_reverse_iterator crbegin()const; - const_reverse_iterator crend()const; + iterator begin()noexcept; + const_iterator begin()const noexcept; + iterator end()noexcept; + const_iterator end()const noexcept; + reverse_iterator rbegin()noexcept; + const_reverse_iterator rbegin()const noexcept; + reverse_iterator rend()noexcept; + const_reverse_iterator rend()const noexcept; + const_iterator cbegin()const noexcept; + const_iterator cend()const noexcept; + const_reverse_iterator crbegin()const noexcept; + const_reverse_iterator crend()const noexcept; iterator iterator_to(const value_type& x); const_iterator iterator_to(const value_type& x)const; // capacity: - bool empty()const; - size_type size()const; - size_type max_size()const; + bool empty()const noexcept; + size_type size()const noexcept; + size_type max_size()const noexcept; void resize(size_type n); void resize(size_type n,const value_type& x); @@ -286,7 +286,7 @@ most important differences are: void swap(index class name& x); - void clear(); + void clear()noexcept; // list operations: @@ -308,7 +308,7 @@ most important differences are: void sort(); template <typename Compare> void sort(Compare comp); - void reverse(); + void reverse()noexcept; // rearrange operations: @@ -922,13 +922,12 @@ is stable, i.e. equivalent elements preserve their relative position.
      not throw; otherwise, basic.

      -void reverse(); +void reverse()noexcept;
      Effects: Reverses the order of the elements in the index.
      Postconditions: Validity of iterators and references is preserved.
      Complexity: O(n).
      -Exception safety: nothrow.

      Rearrange operations

      @@ -1043,7 +1042,7 @@ Random access indices
      -

      Revised July 8th 2013

      +

      Revised October 12th 2013

      © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/doc/release_notes.html b/doc/release_notes.html index 22ed2ca..20914a4 100644 --- a/doc/release_notes.html +++ b/doc/release_notes.html @@ -30,6 +30,7 @@ Acknowledgements

      Contents

      +

      Boost 1.56 release

      + +

      +

        +
      • The erase(iterator) member function of hashed indices + used to have poor performance under low load conditions due to the requirement + that an iterator to the next element must be returned (see ticket + #4264). In accordance with + the resolution of LWG + issue #579, this problem has been fixed while maintaining the interface of + erase, at the expense of using one more + word of memory per element. In fact, C++ complexity requirements on unordered + associative containers have been improved for hashed indices so that +
          +
        • deletion of a given element is unconditionally constant-time,
          • +
        • worst-case performance is not O(n) but O(ndist), + where ndist is the number of non-equivalent elements in the index. +
          • +
        + Due to the fact that hashed indices rely on a new data structure, the internal representation of + their iterators and local iterators have changed, which affects serialization: their corresponding + serialization class version has been + bumped from 0 to 1. Old archives involving hashed index (local) iterators can be loaded + by Boost 1.56 version of Boost.MultiIndex, but not the other way around. +
        • +
      • Hashed indices now provide reserve.
        • +
      • Hashed indices can now be checked for equality and inequality following the + (suitably adapted) C++ standard specification in [unord.req].
        • +
      • The public interface of Boost.MultiIndex provide noexcept specifications + where appropriate (for compliant compilers). +
        • +
      • Improved performance of failed insertions into a multi_index_container.
        • +
      • Much internal code aimed at supporting MSVC++ 7.0 and prior has been removed. + Compilation times without this legacy code might be slightly faster. +
        • +
      • Maintenance fixes.
        • +
      +

      +

      Boost 1.55 release

      @@ -81,6 +121,7 @@ Acknowledgements

    • Maintenance fixes.

    +

    Boost 1.54 release

    @@ -404,7 +445,7 @@ Acknowledgements
    -

    Revised July 9st 2013

    +

    Revised November 30th 2013

    © Copyright 2003-2013 Joaquín M López Muñoz. Distributed under the Boost Software diff --git a/example/basic.cpp b/example/basic.cpp index af31048..f7c46ce 100644 --- a/example/basic.cpp +++ b/example/basic.cpp @@ -1,6 +1,6 @@ /* Boost.MultiIndex basic example. * - * Copyright 2003-2008 Joaquin M Lopez Munoz. + * Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -69,10 +69,7 @@ typedef multi_index_container< > employee_set; template -void print_out_by( - const MultiIndexContainer& s, - Tag* =0 /* fixes a MSVC++ 6.0 bug with implicit template function parms */ -) +void print_out_by(const MultiIndexContainer& s) { /* obtain a reference to the index tagged by Tag */ diff --git a/example/composite_keys.cpp b/example/composite_keys.cpp index 9de947d..e9da2af 100644 --- a/example/composite_keys.cpp +++ b/example/composite_keys.cpp @@ -81,19 +81,9 @@ typedef multi_index_container< file_entry, indexed_by< /* primary index sorted by name (inside the same directory) */ - ordered_unique< - name_key -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - ,composite_key_result_less -#endif - >, + ordered_unique, /* secondary index sorted by size (inside the same directory) */ - ordered_non_unique< - size_key -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - ,composite_key_result_less -#endif - > + ordered_non_unique > > file_system; diff --git a/include/boost/multi_index/composite_key.hpp b/include/boost/multi_index/composite_key.hpp index 2c21a6a..cf3349d 100644 --- a/include/boost/multi_index/composite_key.hpp +++ b/include/boost/multi_index/composite_key.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2011 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,19 +9,17 @@ #ifndef BOOST_MULTI_INDEX_COMPOSITE_KEY_HPP #define BOOST_MULTI_INDEX_COMPOSITE_KEY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include #include -#include #include #include #include #include -#include #include #include #include @@ -59,12 +57,8 @@ */ #if !defined(BOOST_MULTI_INDEX_LIMIT_COMPOSITE_KEY_SIZE) -#if defined(BOOST_MSVC)&&(BOOST_MSVC<1300) -#define BOOST_MULTI_INDEX_LIMIT_COMPOSITE_KEY_SIZE 5 -#else #define BOOST_MULTI_INDEX_LIMIT_COMPOSITE_KEY_SIZE 10 #endif -#endif /* maximum number of key extractors in a composite key */ @@ -114,17 +108,14 @@ namespace detail{ /* n-th key extractor of a composite key */ -template +template struct nth_key_from_value { typedef typename CompositeKey::key_extractor_tuple key_extractor_tuple; - typedef typename prevent_eti< + typedef typename mpl::eval_if_c< + N::value, tuples::element, - typename mpl::eval_if_c< - N::value, - tuples::element, - mpl::identity - >::type + mpl::identity >::type type; }; @@ -146,7 +137,7 @@ struct BOOST_PP_CAT(key_,name) \ typedef tuples::null_type type; \ }; \ \ -template \ +template \ struct BOOST_PP_CAT(nth_composite_key_,name) \ { \ typedef typename nth_key_from_value::type key_from_value; \ @@ -589,16 +580,6 @@ struct composite_key_result /* composite_key */ -/* NB. Some overloads of operator() have an extra dummy parameter int=0. - * This disambiguator serves several purposes: - * - Without it, MSVC++ 6.0 incorrectly regards some overloads as - * specializations of a previous member function template. - * - MSVC++ 6.0/7.0 seem to incorrectly treat some different memfuns - * as if they have the same signature. - * - If remove_const is broken due to lack of PTS, int=0 avoids the - * declaration of memfuns with identical signature. - */ - template< typename Value, BOOST_MULTI_INDEX_CK_ENUM(BOOST_MULTI_INDEX_CK_TEMPLATE_PARM,KeyFromValue) @@ -648,7 +629,7 @@ public: return result_type(*this,x.get()); } - result_type operator()(const reference_wrapper& x,int=0)const + result_type operator()(const reference_wrapper& x)const { return result_type(*this,x.get()); } @@ -1238,7 +1219,6 @@ public: * for composite_key_results enabling interoperation with tuples of values. */ -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) namespace std{ template @@ -1278,34 +1258,6 @@ struct hash >: }; } /* namespace boost */ -#else -/* Lacking template partial specialization, std::equal_to, std::less and - * std::greater will still work for composite_key_results although without - * tuple interoperability. To achieve the same graceful degrading with - * boost::hash, we define the appropriate hash_value overload. - */ - -namespace boost{ - -#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP) -namespace multi_index{ -#endif - -template -inline std::size_t hash_value( - const boost::multi_index::composite_key_result& x) -{ - boost::multi_index::composite_key_result_hash< - boost::multi_index::composite_key_result > h; - return h(x); -} - -#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP) -} /* namespace multi_index */ -#endif - -} /* namespace boost */ -#endif #undef BOOST_MULTI_INDEX_CK_RESULT_HASH_SUPER #undef BOOST_MULTI_INDEX_CK_RESULT_GREATER_SUPER diff --git a/include/boost/multi_index/detail/access_specifier.hpp b/include/boost/multi_index/detail/access_specifier.hpp index 84c2f7d..f3346e8 100644 --- a/include/boost/multi_index/detail/access_specifier.hpp +++ b/include/boost/multi_index/detail/access_specifier.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ACCESS_SPECIFIER_HPP #define BOOST_MULTI_INDEX_DETAIL_ACCESS_SPECIFIER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -42,8 +42,7 @@ * official Sun Studio 12. */ -#if BOOST_WORKAROUND(__GNUC__, <3)||\ - BOOST_WORKAROUND(__GNUC__,==3)&&(__GNUC_MINOR__<4)||\ +#if BOOST_WORKAROUND(__GNUC__,==3)&&(__GNUC_MINOR__<4)||\ BOOST_WORKAROUND(BOOST_MSVC,==1310)||\ BOOST_WORKAROUND(BOOST_MSVC,==1400)||\ BOOST_WORKAROUND(__SUNPRO_CC,BOOST_TESTED_AT(0x590)) diff --git a/include/boost/multi_index/detail/adl_swap.hpp b/include/boost/multi_index/detail/adl_swap.hpp index e78235d..02b0644 100644 --- a/include/boost/multi_index/detail/adl_swap.hpp +++ b/include/boost/multi_index/detail/adl_swap.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ADL_SWAP_HPP #define BOOST_MULTI_INDEX_DETAIL_ADL_SWAP_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/archive_constructed.hpp b/include/boost/multi_index/detail/archive_constructed.hpp index ee00dfa..0cf7991 100644 --- a/include/boost/multi_index/detail/archive_constructed.hpp +++ b/include/boost/multi_index/detail/archive_constructed.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ARCHIVE_CONSTRUCTED_HPP #define BOOST_MULTI_INDEX_DETAIL_ARCHIVE_CONSTRUCTED_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/auto_space.hpp b/include/boost/multi_index/detail/auto_space.hpp index 00e5470..9d78c3a 100644 --- a/include/boost/multi_index/detail/auto_space.hpp +++ b/include/boost/multi_index/detail/auto_space.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_AUTO_SPACE_HPP #define BOOST_MULTI_INDEX_DETAIL_AUTO_SPACE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -46,11 +45,8 @@ namespace detail{ template > struct auto_space:private noncopyable { - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,T - >::type + typedef typename boost::detail::allocator::rebind_to< + Allocator,T >::type::pointer pointer; explicit auto_space(const Allocator& al=Allocator(),std::size_t n=1): diff --git a/include/boost/multi_index/detail/base_type.hpp b/include/boost/multi_index/detail/base_type.hpp index d25332e..8c9b62b 100644 --- a/include/boost/multi_index/detail/base_type.hpp +++ b/include/boost/multi_index/detail/base_type.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_BASE_TYPE_HPP #define BOOST_MULTI_INDEX_DETAIL_BASE_TYPE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace boost{ @@ -33,17 +32,6 @@ namespace detail{ * a index list. */ -#if BOOST_WORKAROUND(BOOST_MSVC,<1310) -struct index_applier -{ - template - struct apply: - msvc_index_specifier:: - template result_index_class - { - }; -}; -#else struct index_applier { template @@ -54,7 +42,6 @@ struct index_applier BOOST_NESTED_TEMPLATE index_class::type type; }; }; -#endif template struct nth_layer diff --git a/include/boost/multi_index/detail/bidir_node_iterator.hpp b/include/boost/multi_index/detail/bidir_node_iterator.hpp index 2155255..9bb0470 100644 --- a/include/boost/multi_index/detail/bidir_node_iterator.hpp +++ b/include/boost/multi_index/detail/bidir_node_iterator.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_BIDIR_NODE_ITERATOR_HPP #define BOOST_MULTI_INDEX_DETAIL_BIDIR_NODE_ITERATOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/bucket_array.hpp b/include/boost/multi_index/detail/bucket_array.hpp index a6772ad..14220c9 100644 --- a/include/boost/multi_index/detail/bucket_array.hpp +++ b/include/boost/multi_index/detail/bucket_array.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_BUCKET_ARRAY_HPP #define BOOST_MULTI_INDEX_DETAIL_BUCKET_ARRAY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,8 +17,11 @@ #include #include #include -#include #include +#include +#include +#include +#include #include #include @@ -36,115 +39,143 @@ namespace detail{ /* bucket structure for use by hashed indices */ +#define BOOST_MULTI_INDEX_BA_SIZES_32BIT \ +(53ul)(97ul)(193ul)(389ul)(769ul) \ +(1543ul)(3079ul)(6151ul)(12289ul)(24593ul) \ +(49157ul)(98317ul)(196613ul)(393241ul)(786433ul) \ +(1572869ul)(3145739ul)(6291469ul)(12582917ul)(25165843ul) \ +(50331653ul)(100663319ul)(201326611ul)(402653189ul)(805306457ul) \ +(1610612741ul)(3221225473ul) + +#if ((((ULONG_MAX>>16)>>16)>>16)>>15)==0 /* unsigned long less than 64 bits */ +#define BOOST_MULTI_INDEX_BA_SIZES \ +BOOST_MULTI_INDEX_BA_SIZES_32BIT \ +(4294967291ul) +#else + /* obtained with aid from + * http://javaboutique.internet.com/prime_numb/ + * http://www.rsok.com/~jrm/next_ten_primes.html + * and verified with + * http://www.alpertron.com.ar/ECM.HTM + */ + +#define BOOST_MULTI_INDEX_BA_SIZES \ +BOOST_MULTI_INDEX_BA_SIZES_32BIT \ +(6442450939ul)(12884901893ul)(25769803751ul)(51539607551ul) \ +(103079215111ul)(206158430209ul)(412316860441ul)(824633720831ul) \ +(1649267441651ul)(3298534883309ul)(6597069766657ul)(13194139533299ul) \ +(26388279066623ul)(52776558133303ul)(105553116266489ul)(211106232532969ul) \ +(422212465066001ul)(844424930131963ul)(1688849860263953ul) \ +(3377699720527861ul)(6755399441055731ul)(13510798882111483ul) \ +(27021597764222939ul)(54043195528445957ul)(108086391056891903ul) \ +(216172782113783843ul)(432345564227567621ul)(864691128455135207ul) \ +(1729382256910270481ul)(3458764513820540933ul)(6917529027641081903ul) \ +(13835058055282163729ul)(18446744073709551557ul) +#endif + +template /* templatized to have in-header static var defs */ class bucket_array_base:private noncopyable { protected: - inline static std::size_t next_prime(std::size_t n) + static const std::size_t sizes[]; + + static std::size_t size_index(std::size_t n) { - static const std::size_t prime_list[]={ - 53ul, 97ul, 193ul, 389ul, 769ul, - 1543ul, 3079ul, 6151ul, 12289ul, 24593ul, - 49157ul, 98317ul, 196613ul, 393241ul, 786433ul, - 1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul, - 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul, - 1610612741ul, 3221225473ul, - -#if ((((ULONG_MAX>>16)>>16)>>16)>>15)==0 /* unsigned long less than 64 bits */ - 4294967291ul -#else - /* obtained with aid from - * http://javaboutique.internet.com/prime_numb/ - * http://www.rsok.com/~jrm/next_ten_primes.html - * and verified with - * http://www.alpertron.com.ar/ECM.HTM - */ - - 6442450939ul, 12884901893ul, 25769803751ul, 51539607551ul, - 103079215111ul, 206158430209ul, 412316860441ul, 824633720831ul, - 1649267441651ul, 3298534883309ul, 6597069766657ul, 13194139533299ul, - 26388279066623ul, 52776558133303ul, 105553116266489ul, 211106232532969ul, - 422212465066001ul, 844424930131963ul, 1688849860263953ul, - 3377699720527861ul, 6755399441055731ul, 13510798882111483ul, - 27021597764222939ul, 54043195528445957ul, 108086391056891903ul, - 216172782113783843ul, 432345564227567621ul, 864691128455135207ul, - 1729382256910270481ul, 3458764513820540933ul, 6917529027641081903ul, - 13835058055282163729ul, 18446744073709551557ul -#endif - - }; - static const std::size_t prime_list_size= - sizeof(prime_list)/sizeof(prime_list[0]); - - std::size_t const *bound= - std::lower_bound(prime_list,prime_list+prime_list_size,n); - if(bound==prime_list+prime_list_size)bound--; - return *bound; + const std::size_t *bound=std::lower_bound(sizes,sizes+sizes_length,n); + if(bound==sizes+sizes_length)bound--; + return bound-sizes; } + +#define BOOST_MULTI_INDEX_BA_POSITION_CASE(z,n,_) \ + case n:return hash%BOOST_PP_SEQ_ELEM(n,BOOST_MULTI_INDEX_BA_SIZES); + + static std::size_t position(std::size_t hash,std::size_t size_index_) + { + /* Accelerate hash%sizes[size_index_] by replacing with a switch on + * hash%Ci expressions, each Ci a compile-time constant, which the + * compiler can implement without using integer division. + */ + + switch(size_index_){ + default: /* never used */ + BOOST_PP_REPEAT( + BOOST_PP_SEQ_SIZE(BOOST_MULTI_INDEX_BA_SIZES), + BOOST_MULTI_INDEX_BA_POSITION_CASE,~) + } + } + +private: + static const std::size_t sizes_length; }; +template +const std::size_t bucket_array_base<_>::sizes[]={ + BOOST_PP_SEQ_ENUM(BOOST_MULTI_INDEX_BA_SIZES) +}; + +template +const std::size_t bucket_array_base<_>::sizes_length= + sizeof(bucket_array_base<_>::sizes)/ + sizeof(bucket_array_base<_>::sizes[0]); + +#undef BOOST_MULTI_INDEX_BA_POSITION_CASE +#undef BOOST_MULTI_INDEX_BA_SIZES +#undef BOOST_MULTI_INDEX_BA_SIZES_32BIT + template -class bucket_array:public bucket_array_base +class bucket_array:bucket_array_base<> { - typedef typename prevent_eti< - Allocator, - hashed_index_node_impl< - typename boost::detail::allocator::rebind_to< - Allocator, - char - >::type - > - >::type node_impl_type; + typedef bucket_array_base<> super; + typedef hashed_index_base_node_impl< + typename boost::detail::allocator::rebind_to< + Allocator, + char + >::type + > base_node_impl_type; public: - typedef typename node_impl_type::pointer pointer; + typedef typename base_node_impl_type::base_pointer base_pointer; + typedef typename base_node_impl_type::pointer pointer; - bucket_array(const Allocator& al,pointer end_,std::size_t size): - size_(bucket_array_base::next_prime(size)), - spc(al,size_+1) + bucket_array(const Allocator& al,pointer end_,std::size_t size_): + size_index_(super::size_index(size_)), + spc(al,super::sizes[size_index_]+1) { - clear(); - end()->next()=end_; - end_->next()=end(); + clear(end_); } std::size_t size()const { - return size_; + return super::sizes[size_index_]; } std::size_t position(std::size_t hash)const { - return hash%size_; + return super::position(hash,size_index_); } - pointer begin()const{return buckets();} - pointer end()const{return buckets()+size_;} - pointer at(std::size_t n)const{return buckets()+n;} + base_pointer begin()const{return buckets();} + base_pointer end()const{return buckets()+size();} + base_pointer at(std::size_t n)const{return buckets()+n;} - std::size_t first_nonempty(std::size_t n)const + void clear(pointer end_) { - for(;;++n){ - pointer x=at(n); - if(x->next()!=x)return n; - } - } - - void clear() - { - for(pointer x=begin(),y=end();x!=y;++x)x->next()=x; - } + for(base_pointer x=begin(),y=end();x!=y;++x)x->next()=pointer(0); + end()->next()=end_->next()=end_; + end_->prior()=end(); + } void swap(bucket_array& x) { - std::swap(size_,x.size_); + std::swap(size_index_,x.size_index_); spc.swap(x.spc); } private: - std::size_t size_; - auto_space spc; + std::size_t size_index_; + auto_space spc; - pointer buckets()const + base_pointer buckets()const { return spc.data(); } diff --git a/include/boost/multi_index/detail/converter.hpp b/include/boost/multi_index/detail/converter.hpp index a46cff6..3e04a3e 100644 --- a/include/boost/multi_index/detail/converter.hpp +++ b/include/boost/multi_index/detail/converter.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_CONVERTER_HPP #define BOOST_MULTI_INDEX_DETAIL_CONVERTER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/copy_map.hpp b/include/boost/multi_index/detail/copy_map.hpp index 4279a8d..a0b6cad 100644 --- a/include/boost/multi_index/detail/copy_map.hpp +++ b/include/boost/multi_index/detail/copy_map.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_COPY_MAP_HPP #define BOOST_MULTI_INDEX_DETAIL_COPY_MAP_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -110,20 +109,18 @@ public: } private: - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,Node>::type - >::type allocator_type; - typedef typename allocator_type::pointer allocator_pointer; + typedef typename boost::detail::allocator::rebind_to< + Allocator,Node + >::type allocator_type; + typedef typename allocator_type::pointer allocator_pointer; - allocator_type al_; - std::size_t size_; - auto_space,Allocator> spc; - std::size_t n; - Node* header_org_; - Node* header_cpy_; - bool released; + allocator_type al_; + std::size_t size_; + auto_space,Allocator> spc; + std::size_t n; + Node* header_org_; + Node* header_cpy_; + bool released; void deallocate(Node* node) { diff --git a/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp b/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp index a7b3f18..f0fa730 100644 --- a/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp +++ b/include/boost/multi_index/detail/do_not_copy_elements_tag.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_DO_NOT_COPY_ELEMENTS_TAG_HPP #define BOOST_MULTI_INDEX_DETAIL_DO_NOT_COPY_ELEMENTS_TAG_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/duplicates_iterator.hpp b/include/boost/multi_index/detail/duplicates_iterator.hpp index 027dabd..cbebf26 100644 --- a/include/boost/multi_index/detail/duplicates_iterator.hpp +++ b/include/boost/multi_index/detail/duplicates_iterator.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_DUPLICATES_ITERATOR_HPP #define BOOST_MULTI_INDEX_DETAIL_DUPLICATES_ITERATOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/has_tag.hpp b/include/boost/multi_index/detail/has_tag.hpp index 83b28cc..217b611 100644 --- a/include/boost/multi_index/detail/has_tag.hpp +++ b/include/boost/multi_index/detail/has_tag.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_HAS_TAG_HPP #define BOOST_MULTI_INDEX_DETAIL_HAS_TAG_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/hash_index_args.hpp b/include/boost/multi_index/detail/hash_index_args.hpp index 4972f9b..81902f5 100644 --- a/include/boost/multi_index/detail/hash_index_args.hpp +++ b/include/boost/multi_index/detail/hash_index_args.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_ARGS_HPP #define BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_ARGS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/hash_index_iterator.hpp b/include/boost/multi_index/detail/hash_index_iterator.hpp index 352c1d8..fb1a967 100644 --- a/include/boost/multi_index/detail/hash_index_iterator.hpp +++ b/include/boost/multi_index/detail/hash_index_iterator.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_ITERATOR_HPP #define BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_ITERATOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -19,6 +19,7 @@ #if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) #include #include +#include #endif namespace boost{ @@ -30,10 +31,13 @@ namespace detail{ /* Iterator class for hashed indices. */ -template +struct hashed_index_global_iterator_tag{}; +struct hashed_index_local_iterator_tag{}; + +template class hashed_index_iterator: public forward_iterator_helper< - hashed_index_iterator, + hashed_index_iterator, typename Node::value_type, std::ptrdiff_t, const typename Node::value_type*, @@ -41,9 +45,7 @@ class hashed_index_iterator: { public: hashed_index_iterator(){} - hashed_index_iterator(Node* node_,BucketArray* buckets_): - node(node_),buckets(buckets_) - {} + hashed_index_iterator(Node* node_):node(node_){} const typename Node::value_type& operator*()const { @@ -52,7 +54,7 @@ public: hashed_index_iterator& operator++() { - Node::increment(node,buckets->begin(),buckets->end()); + this->increment(Category()); return *this; } @@ -70,16 +72,42 @@ public: { node_base_type* bnode=node; ar< - void load(Archive& ar,const unsigned int) + void load(Archive& ar,const unsigned int version) + { + load(ar,version,Category()); + } + + template + void load( + Archive& ar,const unsigned int version,hashed_index_global_iterator_tag) { node_base_type* bnode; ar>>serialization::make_nvp("pointer",bnode); node=static_cast(bnode); - ar>>serialization::make_nvp("pointer",buckets); + if(version<1){ + BucketArray* throw_away; /* consume unused ptr */ + ar>>serialization::make_nvp("pointer",throw_away); + } + } + + template + void load( + Archive& ar,const unsigned int version,hashed_index_local_iterator_tag) + { + node_base_type* bnode; + ar>>serialization::make_nvp("pointer",bnode); + node=static_cast(bnode); + if(version<1){ + BucketArray* buckets; + ar>>serialization::make_nvp("pointer",buckets); + if(buckets&&node&&node->impl()==buckets->end()->next()->next()){ + /* end local_iterators used to point to end node, now they are null */ + node=0; + } + } } #endif @@ -90,14 +118,24 @@ public: Node* get_node()const{return node;} private: - Node* node; - BucketArray* buckets; + + void increment(hashed_index_global_iterator_tag) + { + Node::increment(node); + } + + void increment(hashed_index_local_iterator_tag) + { + Node::increment_local(node); + } + + Node* node; }; -template +template bool operator==( - const hashed_index_iterator& x, - const hashed_index_iterator& y) + const hashed_index_iterator& x, + const hashed_index_iterator& y) { return x.get_node()==y.get_node(); } @@ -106,6 +144,22 @@ bool operator==( } /* namespace multi_index */ +#if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) +/* class version = 1 : hashed_index_iterator does no longer serialize a bucket + * array pointer. + */ + +namespace serialization { +template +struct version< + boost::multi_index::detail::hashed_index_iterator +> +{ + BOOST_STATIC_CONSTANT(int,value=1); +}; +} /* namespace serialization */ +#endif + } /* namespace boost */ #endif diff --git a/include/boost/multi_index/detail/hash_index_node.hpp b/include/boost/multi_index/detail/hash_index_node.hpp index edb2c10..11290e1 100644 --- a/include/boost/multi_index/detail/hash_index_node.hpp +++ b/include/boost/multi_index/detail/hash_index_node.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,14 +9,12 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_NODE_HPP #define BOOST_MULTI_INDEX_DETAIL_HASH_INDEX_NODE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include -#include -#include namespace boost{ @@ -24,104 +22,632 @@ namespace multi_index{ namespace detail{ -/* singly-linked node for use by hashed_index */ +/* Certain C++ requirements on unordered associative containers (see LWG issue + * #579) imply a data structure where nodes are linked in a single list, which + * in its turn forces implementors to add additional overhed per node to + * associate each with its corresponding bucket. Others resort to storing hash + * values, we use an alternative structure providing unconditional O(1) + * manipulation, even in situations of unfair hash distribution, plus some + * lookup speedups. For unique indices we maintain a doubly linked list of + * nodes except that the first node N of a bucket is back-linked to its bucket + * node, and this bucket node forward links to the node preceding N. + * + * +---+ +---+ +---+ +---+ + * | +-->| +--> | +-->| +--> + * ... | B0| | B1| ... | B1| | B2| ... + * <--+ | +-+ | <--+ | +-+ | + * +---+ | +---+ +---+ | +---+ + * ^ | ^ | + * | | | | + * +-+ | +-+ | + * | | | | + * + v + v + * --+---+---+---+-- --+---+---+---+-- + * ... | | B1| | ... | | B2| | ... + * --+---+---+---+-- --+---+---+---+-- + * + * The fist and last nodes of buckets can be checked with + * + * first node of a bucket: Npn != N + * last node of a bucket: Nnp != N + * + * (n and p short for ->next(), ->prior()). Pure insert and erase (without + * lookup) can be unconditionally done in O(1). + * For non-unique indices we add the following additional complexity: when + * there is a group of 3 or more equivalent elements, they are linked as + * follows: + * + * +-----------------------+ + * v | + * +---+ +---+ +---+ | +---+ + * | +-->| | | +-+ | | + * | F | | S | ... | P | | L | + * | | +-+ | | |<--+ | + * +---+ | +---+ +---+ +---+ + * | ^ + * +-----------------------+ + * + * F, S, P and L are the first, second, penultimate and last node in the + * group, respectively (S and P can coincide if the group has size 3.) This + * arrangement is used to skip equivalent elements in O(1) when doing lookup, + * while preserving O(1) insert/erase. The following invariants identify + * special positions (some of the operations have to be carefully implemented + * as Xpp is not valid if Xp points to a bucket): + * + * first node of a bucket: Npnn == N + * last node of a bucket: Nnpn == N + * first node of a group: Nnp != N && Nnppn == N + * second node of a group: Npn != N && Nppnn == N + * n-1 node of a group: Nnp != N && Nnnpp == N + * last node of a group: Npn != N && Npnnp == N + * + * The memory overhead is one pointer per bucket plus two pointers per node, + * probably unbeatable. The resulting structure is bidirectonally traversable, + * though currently we are just providing forward iteration. + */ template -struct hashed_index_node_impl +struct hashed_index_node_impl; + +/* half-header (only next() pointer) to use for the bucket array */ + +template +struct hashed_index_base_node_impl { - typedef typename prevent_eti< + typedef typename + boost::detail::allocator::rebind_to< + Allocator,hashed_index_base_node_impl + >::type::pointer base_pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,hashed_index_base_node_impl + >::type::const_pointer const_base_pointer; + typedef typename + boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,hashed_index_node_impl - >::type - >::type::pointer pointer; - typedef typename prevent_eti< + hashed_index_node_impl + >::type::pointer pointer; + typedef typename + boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,hashed_index_node_impl - >::type - >::type::const_pointer const_pointer; + hashed_index_node_impl + >::type::const_pointer const_pointer; pointer& next(){return next_;} pointer next()const{return next_;} - /* algorithmic stuff */ - - static void increment(pointer& x,pointer bbegin,pointer bend) - { - std::less_equal leq; - - x=x->next(); - if(leq(bbegin,x)&&leq(x,bend)){ /* bucket node */ - do{ - ++x; - }while(x->next()==x); - x=x->next(); - } - } - - static void link(pointer x,pointer pos) - { - x->next()=pos->next(); - pos->next()=x; - }; - - static void unlink(pointer x) - { - pointer y=x->next(); - while(y->next()!=x){y=y->next();} - y->next()=x->next(); - } - - static pointer prev(pointer x) - { - pointer y=x->next(); - while(y->next()!=x){y=y->next();} - return y; - } - - static void unlink_next(pointer x) - { - x->next()=x->next()->next(); - } - private: pointer next_; }; -template -struct hashed_index_node_trampoline: - prevent_eti< - Super, - hashed_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type +/* full header (next() and prior()) for the nodes */ + +template +struct hashed_index_node_impl:hashed_index_base_node_impl { - typedef typename prevent_eti< - Super, - hashed_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type impl_type; +private: + typedef hashed_index_base_node_impl super; + +public: + typedef typename super::base_pointer base_pointer; + typedef typename super::const_base_pointer const_base_pointer; + typedef typename super::pointer pointer; + typedef typename super::const_pointer const_pointer; + + base_pointer& prior(){return prior_;} + base_pointer prior()const{return prior_;} + + static pointer pointer_from(base_pointer x) + { + return static_cast(static_cast(&*x)); + } + + static base_pointer base_pointer_from(pointer x) + { + return static_cast(&*x); + } + +private: + base_pointer prior_; +}; + +/* Boost.MultiIndex requires machinery to reverse unlink operations. A simple + * way to make a pointer-manipulation function undoable is to templatize + * its internal pointer assignments with a functor that, besides doing the + * assignment, keeps track of the original pointer values and can later undo + * the operations in reverse order. + */ + +struct default_assigner +{ + template void operator()(T& x,const T& val){x=val;} +}; + +template +struct unlink_undo_assigner +{ + typedef typename Node::base_pointer base_pointer; + typedef typename Node::pointer pointer; + + unlink_undo_assigner():pointer_track_count(0),base_pointer_track_count(0){} + + void operator()(pointer& x,pointer val) + { + pointer_tracks[pointer_track_count].x=&x; + pointer_tracks[pointer_track_count++].val=x; + x=val; + } + + void operator()(base_pointer& x,base_pointer val) + { + base_pointer_tracks[base_pointer_track_count].x=&x; + base_pointer_tracks[base_pointer_track_count++].val=x; + x=val; + } + + void operator()() /* undo op */ + { + /* in the absence of aliasing, restitution order is immaterial */ + + while(pointer_track_count--){ + *(pointer_tracks[pointer_track_count].x)= + pointer_tracks[pointer_track_count].val; + } + while(base_pointer_track_count--){ + *(base_pointer_tracks[base_pointer_track_count].x)= + base_pointer_tracks[base_pointer_track_count].val; + } + } + + struct pointer_track {pointer* x; pointer val;}; + struct base_pointer_track{base_pointer* x; base_pointer val;}; + + /* We know the maximum number of pointer and base pointer assignments that + * the two unlink versions do, so we can statically reserve the needed + * storage. + */ + + pointer_track pointer_tracks[3]; + int pointer_track_count; + base_pointer_track base_pointer_tracks[2]; + int base_pointer_track_count; +}; + +/* algorithmic stuff for unique and non-unique variants */ + +struct hashed_unique_tag{}; +struct hashed_non_unique_tag{}; + +template +struct hashed_index_node_alg; + +template +struct hashed_index_node_alg +{ + typedef typename Node::base_pointer base_pointer; + typedef typename Node::const_base_pointer const_base_pointer; + typedef typename Node::pointer pointer; + typedef typename Node::const_pointer const_pointer; + + static bool is_first_of_bucket(pointer x) + { + return x->prior()->next()!=x; + } + + static pointer after(pointer x) + { + return x->next(); + } + + static pointer after_local(pointer x) + { + return is_last_of_bucket(x)?pointer(0):after(x); + } + + static pointer next_to_inspect(pointer x) + { + pointer y=x->next(); + if(y->prior()==base_pointer_from(x))return y; + else return pointer(0); /* x last of bucket, bucket finished */ + } + + static void link(pointer x,base_pointer buc,pointer end) + { + if(buc->next()==pointer(0)){ /* empty bucket */ + x->next()=end->next(); + x->next()->prior()->next()=x; + x->prior()=buc; + buc->next()=end; + end->next()=x; + } + else{ + x->next()=buc->next()->next(); + x->next()->prior()=base_pointer_from(x); + x->prior()=buc; + buc->next()->next()=x; + } + }; + + static void unlink(pointer x) + { + default_assigner assign; + unlink(x,assign); + } + + typedef unlink_undo_assigner unlink_undo; + + template + static void unlink(pointer x,Assigner& assign) + { + if(is_first_of_bucket(x)){ + if(is_last_of_bucket(x)){ + assign(x->prior()->next()->next(),x->next()); + assign(x->next()->prior()->next(),x->prior()->next()); + assign(x->prior()->next(),pointer(0)); + } + else{ + assign(x->prior()->next()->next(),x->next()); + assign(x->next()->prior(),x->prior()); + } + } + else if(is_last_of_bucket(x)){ + assign(x->prior()->next(),x->next()); + assign(x->next()->prior()->next(),pointer_from(x->prior())); + } + else{ + assign(x->prior()->next(),x->next()); + assign(x->next()->prior(),x->prior()); + } + } + +private: + static pointer pointer_from(base_pointer x) + { + return Node::pointer_from(x); + } + + static base_pointer base_pointer_from(pointer x) + { + return Node::base_pointer_from(x); + } + + static bool is_last_of_bucket(pointer x) + { + return x->next()->prior()!=base_pointer_from(x); + } +}; + +template +struct hashed_index_node_alg +{ + typedef typename Node::base_pointer base_pointer; + typedef typename Node::const_base_pointer const_base_pointer; + typedef typename Node::pointer pointer; + typedef typename Node::const_pointer const_pointer; + + static bool is_first_of_bucket(pointer x) + { + return x->prior()->next()->next()==x; + } + + static bool is_first_of_group(pointer x) + { + return + x->next()->prior()!=base_pointer_from(x)&& + !is_first_of_bucket(x->next())&& + pointer_from(x->next()->prior())->prior()->next()==base_pointer_from(x); + } + + static pointer after(pointer x) + { + if(is_last_but_one_of_group(x)){ + return pointer_from(x->next()->next()->prior()); + } + else{ + return x->next(); + } + } + + static pointer after_local(pointer x) + { + return is_last_of_bucket(x)?pointer(0):after(x); + } + + static pointer next_to_inspect(pointer x) + { + pointer y=x->next(); + if(y->prior()==base_pointer_from(x))return y; + pointer z=y->prior()->next(); + if(z==x|| /* x last of bucket */ + z->prior()->next()!=z) /* group(x) last of bucket */ + return pointer(0); /* bucket finished */ + else return z; + } + + static void link(pointer x,base_pointer buc,pointer end) + { + if(buc->next()==pointer(0)){ /* empty bucket */ + x->next()=end->next(); + x->next()->prior()->next()=x; + x->prior()=buc; + buc->next()=end; + end->next()=x; + } + else{ + x->next()=buc->next()->next(); + x->next()->prior()=base_pointer_from(x); + x->prior()=buc; + buc->next()->next()=x; + } + }; + + static void link(pointer x,pointer first,pointer last) + { + x->prior()=first->prior(); + x->next()=first; + if(is_first_of_bucket(first)){ + x->prior()->next()->next()=x; + } + else{ + x->prior()->next()=x; + } + + if(first==last){ + last->prior()=base_pointer_from(x); + } + else if(first->next()==last){ + first->prior()=base_pointer_from(last); + first->next()=x; + } + else{ + pointer second=first->next(), + lastbutone=pointer_from(last->prior()); + second->prior()=base_pointer_from(first); + first->prior()=base_pointer_from(last); + lastbutone->next()=x; + } + } + + static void link_range( + pointer first,pointer last,base_pointer buc,pointer cend) + { + if(buc->next()==pointer(0)){ /* empty bucket */ + last->next()=cend->next(); + last->next()->prior()->next()=last; + first->prior()=buc; + buc->next()=cend; + cend->next()=first; + } + else{ + last->next()=buc->next()->next(); + last->next()->prior()=base_pointer_from(last); + first->prior()=buc; + buc->next()->next()=first; + } + } + + static void unlink(pointer x) + { + default_assigner assign; + unlink(x,assign); + } + + typedef unlink_undo_assigner unlink_undo; + + template + static void unlink(pointer x,Assigner& assign) + { + if(x->prior()->next()==x){ + if(x->next()->prior()==base_pointer_from(x)){ + left_unlink(x,assign); + right_unlink(x,assign); + } + else if(x->next()->prior()->next()==x){ /* last of bucket */ + left_unlink(x,assign); + right_unlink_last_of_bucket(x,assign); + } + else if(x->next()->next()==x){ /* first of group size==3 */ + left_unlink(x,assign); + assign(x->next()->next(),pointer_from(x->next()->prior())); + right_unlink(x,assign); + } + else if( + x->next()->next()->prior()== + base_pointer_from(x->next())){ /* first of group size>3 */ + left_unlink(x,assign); + right_unlink_first_of_group_gt_3(x,assign); + } + else{ /* n-1 of group size>3 */ + unlink_last_but_one_of_group_gt_3(x,assign); + } + } + else if(x->prior()->next()->next()==x){ /* first of bucket */ + if(x->next()->prior()==base_pointer_from(x)){ + left_unlink_first_of_bucket(x,assign); + right_unlink(x,assign); + } + else if(x->next()->prior()->next()==x){ /* last of bucket */ + left_unlink_first_of_bucket(x,assign); + assign(x->next()->prior()->next(),x->prior()->next()); + assign(x->prior()->next(),pointer(0)); + } + else{ /* first of group */ + left_unlink_first_of_bucket(x,assign); + right_unlink_first_of_group(x,assign); + } + } + else if(x->prior()->next()->next()->prior()== + base_pointer_from(x)){ /* last of group */ + if(x->next()->prior()==base_pointer_from(x)){ + left_unlink_last_of_group(x,assign); + right_unlink(x,assign); + } + else{ /* last of bucket */ + left_unlink_last_of_group(x,assign); + right_unlink_last_of_bucket(x,assign); + } + } + else{ /* second of group */ + unlink_second_of_group(x,assign); + } + } + +private: + static pointer pointer_from(base_pointer x) + { + return Node::pointer_from(x); + } + + static base_pointer base_pointer_from(pointer x) + { + return Node::base_pointer_from(x); + } + + static bool is_last_of_bucket(pointer x) + { + return x->next()->prior()->next()==x; + } + + static bool is_last_but_one_of_group(pointer x) + { + return + x->next()->prior()!=base_pointer_from(x)&& + !is_last_of_bucket(x->next())&& + pointer_from(x->next()->next()->prior())->prior()==base_pointer_from(x); + } + + template + static void left_unlink(pointer x,Assigner& assign) + { + assign(x->prior()->next(),x->next()); + } + + template + static void right_unlink(pointer x,Assigner& assign) + { + assign(x->next()->prior(),x->prior()); + } + + template + static void left_unlink_first_of_bucket(pointer x,Assigner& assign) + { + assign(x->prior()->next()->next(),x->next()); + } + + template + static void right_unlink_last_of_bucket(pointer x,Assigner& assign) + { + assign(x->next()->prior()->next(),pointer_from(x->prior())); + } + + template + static void right_unlink_first_of_group(pointer x,Assigner& assign) + { + pointer second=x->next(), + last=pointer_from(second->prior()), + lastbutone=pointer_from(last->prior()); + if(second==lastbutone){ + assign(second->next(),last); + assign(second->prior(),x->prior()); + } + else{ + assign(lastbutone->next(),second); + assign(second->next()->prior(),base_pointer_from(last)); + assign(second->prior(),x->prior()); + } + } + + template + static void right_unlink_first_of_group_gt_3(pointer x,Assigner& assign) + { + pointer second=x->next(), + last=pointer_from(second->prior()), + lastbutone=pointer_from(last->prior()); + assign(lastbutone->next(),second); + assign(second->next()->prior(),base_pointer_from(last)); + assign(second->prior(),x->prior()); + } + + template + static void left_unlink_last_of_group(pointer x,Assigner& assign) + { + pointer lastbutone=pointer_from(x->prior()), + first=lastbutone->next(), + second=first->next(); + if(lastbutone==second){ + assign(lastbutone->prior(),base_pointer_from(first)); + assign(lastbutone->next(),x->next()); + } + else{ + assign(second->prior(),base_pointer_from(lastbutone)); + assign(lastbutone->prior()->next(),first); + assign(lastbutone->next(),x->next()); + } + } + + template + static void unlink_last_but_one_of_group_gt_3(pointer x,Assigner& assign) + { + pointer first=x->next(), + second=first->next(), + last=pointer_from(second->prior()); + assign(last->prior(),x->prior()); + assign(x->prior()->next(),first); + } + + template + static void unlink_second_of_group(pointer x,Assigner& assign) + { + pointer last=pointer_from(x->prior()), + lastbutone=pointer_from(last->prior()), + first=lastbutone->next(); + if(lastbutone==x){ + assign(first->next(),last); + assign(last->prior(),base_pointer_from(first)); + } + else{ + assign(first->next(),x->next()); + assign(x->next()->prior(),base_pointer_from(last)); + } + } }; template -struct hashed_index_node:Super,hashed_index_node_trampoline +struct hashed_index_node_trampoline: + hashed_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > +{ + typedef typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type impl_allocator_type; + typedef hashed_index_node_impl impl_type; +}; + +template +struct hashed_index_node: + Super,hashed_index_node_trampoline { private: typedef hashed_index_node_trampoline trampoline; public: - typedef typename trampoline::impl_type impl_type; - typedef typename trampoline::pointer impl_pointer; - typedef typename trampoline::const_pointer const_impl_pointer; + typedef typename trampoline::impl_type impl_type; + typedef hashed_index_node_alg< + impl_type,Category> node_alg; + typedef typename trampoline::base_pointer impl_base_pointer; + typedef typename trampoline::const_base_pointer const_impl_base_pointer; + typedef typename trampoline::pointer impl_pointer; + typedef typename trampoline::const_pointer const_impl_pointer; + + impl_pointer& next(){return trampoline::next();} + impl_pointer next()const{return trampoline::next();} + impl_base_pointer& prior(){return trampoline::prior();} + impl_base_pointer prior()const{return trampoline::prior();} impl_pointer impl() { @@ -147,12 +673,16 @@ public: static_cast(&*x)); } - static void increment( - hashed_index_node*& x,impl_pointer bbegin,impl_pointer bend) + /* interoperability with hashed_index_iterator */ + + static void increment(hashed_index_node*& x) { - impl_pointer xi=x->impl(); - trampoline::increment(xi,bbegin,bend); - x=from_impl(xi); + x=from_impl(node_alg::after(x->impl())); + } + + static void increment_local(hashed_index_node*& x) + { + x=from_impl(node_alg::after_local(x->impl())); } }; diff --git a/include/boost/multi_index/detail/header_holder.hpp b/include/boost/multi_index/detail/header_holder.hpp index 8716e83..ca8a9b2 100644 --- a/include/boost/multi_index/detail/header_holder.hpp +++ b/include/boost/multi_index/detail/header_holder.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_HEADER_HOLDER_HPP #define BOOST_MULTI_INDEX_DETAIL_HEADER_HOLDER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/index_base.hpp b/include/boost/multi_index/detail/index_base.hpp index a43214a..74a52f8 100644 --- a/include/boost/multi_index/detail/index_base.hpp +++ b/include/boost/multi_index/detail/index_base.hpp @@ -9,12 +9,13 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_BASE_HPP #define BOOST_MULTI_INDEX_DETAIL_INDEX_BASE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include +#include #include #include #include @@ -61,9 +62,10 @@ protected: Value,IndexSpecifierList,Allocator> final_type; typedef tuples::null_type ctor_args_list; typedef typename - boost::detail::allocator::rebind_to< - Allocator, - typename Allocator::value_type>::type final_allocator_type; + boost::detail::allocator::rebind_to< + Allocator, + typename Allocator::value_type + >::type final_allocator_type; typedef mpl::vector0<> index_type_list; typedef mpl::vector0<> iterator_type_list; typedef mpl::vector0<> const_iterator_type_list; @@ -96,43 +98,60 @@ protected: const index_base&,const copy_map_type&) {} - node_type* insert_(const value_type& v,node_type* x,lvalue_tag) + final_node_type* insert_(const value_type& v,final_node_type*& x,lvalue_tag) { - boost::detail::allocator::construct(&x->value(),v); + x=final().allocate_node(); + BOOST_TRY{ + boost::detail::allocator::construct(&x->value(),v); + } + BOOST_CATCH(...){ + final().deallocate_node(x); + BOOST_RETHROW; + } + BOOST_CATCH_END return x; } - node_type* insert_(const value_type& v,node_type* x,rvalue_tag) + final_node_type* insert_(const value_type& v,final_node_type*& x,rvalue_tag) { - /* This shoud have used a modified, T&&-compatible version of - * boost::detail::allocator::construct, but - * is too old and venerable to mess - * with; besides, it is a general internal utility and the imperfect - * perfect forwarding emulation of Boost.Move might break other libs. - */ + x=final().allocate_node(); + BOOST_TRY{ + /* This shoud have used a modified, T&&-compatible version of + * boost::detail::allocator::construct, but + * is too old and venerable to + * mess with; besides, it is a general internal utility and the imperfect + * perfect forwarding emulation of Boost.Move might break other libs. + */ - new (&x->value()) value_type(boost::move(const_cast(v))); + new (&x->value()) value_type(boost::move(const_cast(v))); + } + BOOST_CATCH(...){ + final().deallocate_node(x); + BOOST_RETHROW; + } + BOOST_CATCH_END return x; } - node_type* insert_(const value_type&,node_type* x,emplaced_tag) + final_node_type* insert_(const value_type&,final_node_type*& x,emplaced_tag) { return x; } - node_type* insert_(const value_type& v,node_type*,node_type* x,lvalue_tag) + final_node_type* insert_( + const value_type& v,node_type*,final_node_type*& x,lvalue_tag) { - boost::detail::allocator::construct(&x->value(),v); - return x; + return insert_(v,x,lvalue_tag()); } - node_type* insert_(const value_type& v,node_type*,node_type* x,rvalue_tag) + final_node_type* insert_( + const value_type& v,node_type*,final_node_type*& x,rvalue_tag) { - new (&x->value()) value_type(boost::move(const_cast(v))); - return x; + return insert_(v,x,rvalue_tag()); } - node_type* insert_(const value_type&,node_type*,node_type* x,emplaced_tag) + final_node_type* insert_( + const value_type&,node_type*,final_node_type*& x,emplaced_tag) { return x; } diff --git a/include/boost/multi_index/detail/index_loader.hpp b/include/boost/multi_index/detail/index_loader.hpp index 001c01b..3f0428c 100644 --- a/include/boost/multi_index/detail/index_loader.hpp +++ b/include/boost/multi_index/detail/index_loader.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_LOADER_HPP #define BOOST_MULTI_INDEX_DETAIL_INDEX_LOADER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/index_matcher.hpp b/include/boost/multi_index/detail/index_matcher.hpp index 7e275e1..f3675ac 100644 --- a/include/boost/multi_index/detail/index_matcher.hpp +++ b/include/boost/multi_index/detail/index_matcher.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_MATCHER_HPP #define BOOST_MULTI_INDEX_DETAIL_INDEX_MATCHER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/index_node_base.hpp b/include/boost/multi_index/detail/index_node_base.hpp index ee9f1c6..150eb75 100644 --- a/include/boost/multi_index/detail/index_node_base.hpp +++ b/include/boost/multi_index/detail/index_node_base.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_NODE_BASE_HPP #define BOOST_MULTI_INDEX_DETAIL_INDEX_NODE_BASE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -85,9 +85,7 @@ private: }; template -Node* node_from_value( - const Value* p - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) +Node* node_from_value(const Value* p) { typedef typename Node::allocator_type allocator_type; return static_cast( diff --git a/include/boost/multi_index/detail/index_saver.hpp b/include/boost/multi_index/detail/index_saver.hpp index d9e6bc7..ae09d4e 100644 --- a/include/boost/multi_index/detail/index_saver.hpp +++ b/include/boost/multi_index/detail/index_saver.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INDEX_SAVER_HPP #define BOOST_MULTI_INDEX_DETAIL_INDEX_SAVER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/invariant_assert.hpp b/include/boost/multi_index/detail/invariant_assert.hpp index d5fc256..c6c547c 100644 --- a/include/boost/multi_index/detail/invariant_assert.hpp +++ b/include/boost/multi_index/detail/invariant_assert.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_INVARIANT_ASSERT_HPP #define BOOST_MULTI_INDEX_DETAIL_INVARIANT_ASSERT_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/is_index_list.hpp b/include/boost/multi_index/detail/is_index_list.hpp index 9ee30ba..f6a2421 100644 --- a/include/boost/multi_index/detail/is_index_list.hpp +++ b/include/boost/multi_index/detail/is_index_list.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_IS_INDEX_LIST_HPP #define BOOST_MULTI_INDEX_DETAIL_IS_INDEX_LIST_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/iter_adaptor.hpp b/include/boost/multi_index/detail/iter_adaptor.hpp index 0346184..7a03235 100644 --- a/include/boost/multi_index/detail/iter_adaptor.hpp +++ b/include/boost/multi_index/detail/iter_adaptor.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,13 +9,12 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ITER_ADAPTOR_HPP #define BOOST_MULTI_INDEX_DETAIL_ITER_ADAPTOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include -#include #include namespace boost{ @@ -294,12 +293,9 @@ template struct iter_adaptor_base { typedef iter_adaptor_selector< - typename Base::iterator_category> selector; - typedef typename prevent_eti< - selector, - typename mpl::apply2< - selector,Derived,Base>::type - >::type type; + typename Base::iterator_category> selector; + typedef typename mpl::apply2< + selector,Derived,Base>::type type; }; template diff --git a/include/boost/multi_index/detail/modify_key_adaptor.hpp b/include/boost/multi_index/detail/modify_key_adaptor.hpp index 8a93b96..6df89b1 100644 --- a/include/boost/multi_index/detail/modify_key_adaptor.hpp +++ b/include/boost/multi_index/detail/modify_key_adaptor.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_MODIFY_KEY_ADAPTOR_HPP #define BOOST_MULTI_INDEX_DETAIL_MODIFY_KEY_ADAPTOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/msvc_index_specifier.hpp b/include/boost/multi_index/detail/msvc_index_specifier.hpp deleted file mode 100644 index 4766e53..0000000 --- a/include/boost/multi_index/detail/msvc_index_specifier.hpp +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - * See http://www.boost.org/libs/multi_index for library home page. - */ - -#ifndef BOOST_MULTI_INDEX_DETAIL_MSVC_INDEX_SPECIFIER_HPP -#define BOOST_MULTI_INDEX_DETAIL_MSVC_INDEX_SPECIFIER_HPP - -#if defined(_MSC_VER)&&(_MSC_VER>=1200) -#pragma once -#endif - -#include /* keep it first to prevent nasty warns in MSVC */ -#include - -#if BOOST_WORKAROUND(BOOST_MSVC,<1310) -/* Workaround for a problem in MSVC with dependent template typedefs - * when accesing index specifiers. - * Modeled after (thanks, Aleksey!) - */ - -#include - -namespace boost{ - -namespace multi_index{ - -namespace detail{ - -template -struct msvc_index_specifier -{ - template struct fake_index_type:IndexSpecifier{}; - template<> struct fake_index_type - { - template - struct node_class{}; - - template - struct index_class{}; - }; - - template - struct result_node_class: - fake_index_type::value>:: - template node_class - { - }; - - template - struct result_index_class: - fake_index_type::value>:: - template index_class - { - }; -}; - -} /* namespace multi_index::detail */ - -} /* namespace multi_index */ - -} /* namespace boost */ - -#endif /* workaround */ - -#endif diff --git a/include/boost/multi_index/detail/no_duplicate_tags.hpp b/include/boost/multi_index/detail/no_duplicate_tags.hpp index 9b56e83..ba216ed 100644 --- a/include/boost/multi_index/detail/no_duplicate_tags.hpp +++ b/include/boost/multi_index/detail/no_duplicate_tags.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_NO_DUPLICATE_TAGS_HPP #define BOOST_MULTI_INDEX_DETAIL_NO_DUPLICATE_TAGS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/node_type.hpp b/include/boost/multi_index/detail/node_type.hpp index 0e87261..7fe85cf 100644 --- a/include/boost/multi_index/detail/node_type.hpp +++ b/include/boost/multi_index/detail/node_type.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_NODE_TYPE_HPP #define BOOST_MULTI_INDEX_DETAIL_NODE_TYPE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -22,7 +22,6 @@ #include #include #include -#include #include namespace boost{ @@ -35,17 +34,6 @@ namespace detail{ * index list. */ -#if BOOST_WORKAROUND(BOOST_MSVC,<1310) -struct index_node_applier -{ - template - struct apply: - msvc_index_specifier< mpl::deref::type >:: - template result_node_class - { - }; -}; -#else struct index_node_applier { template @@ -56,7 +44,6 @@ struct index_node_applier BOOST_NESTED_TEMPLATE node_class::type type; }; }; -#endif template struct multi_index_node_type diff --git a/include/boost/multi_index/detail/ord_index_args.hpp b/include/boost/multi_index/detail/ord_index_args.hpp index bb8eb41..3e2641f 100644 --- a/include/boost/multi_index/detail/ord_index_args.hpp +++ b/include/boost/multi_index/detail/ord_index_args.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_ARGS_HPP #define BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_ARGS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/ord_index_node.hpp b/include/boost/multi_index/detail/ord_index_node.hpp index edc4329..60727e0 100644 --- a/include/boost/multi_index/detail/ord_index_node.hpp +++ b/include/boost/multi_index/detail/ord_index_node.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -36,14 +36,13 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_NODE_HPP #define BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_NODE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include #include -#include #if !defined(BOOST_MULTI_INDEX_DISABLE_COMPRESSED_ORDERED_INDEX_NODES) #include @@ -70,22 +69,18 @@ struct ordered_index_node_impl; /* fwd decl. */ template struct ordered_index_node_std_base { - typedef typename prevent_eti< + typedef typename + boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator, - ordered_index_node_impl - >::type - >::type::pointer pointer; - typedef typename prevent_eti< + ordered_index_node_impl + >::type::pointer pointer; + typedef typename + boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator, - ordered_index_node_impl - >::type - >::type::const_pointer const_pointer; - typedef ordered_index_color& color_ref; - typedef pointer& parent_ref; + ordered_index_node_impl + >::type::const_pointer const_pointer; + typedef ordered_index_color& color_ref; + typedef pointer& parent_ref; ordered_index_color& color(){return color_;} ordered_index_color color()const{return color_;} @@ -216,12 +211,9 @@ struct ordered_index_node_impl_base: !(has_uintptr_type::value)|| (alignment_of >::value%2)|| !(is_same< - typename prevent_eti< + typename boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator, - ordered_index_node_impl - >::type + ordered_index_node_impl >::type::pointer, ordered_index_node_impl*>::value), ordered_index_node_std_base, @@ -557,25 +549,19 @@ public: template struct ordered_index_node_trampoline: - prevent_eti< - Super, - ordered_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type + ordered_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > { - typedef typename prevent_eti< - Super, - ordered_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type impl_type; + typedef ordered_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > impl_type; }; template diff --git a/include/boost/multi_index/detail/ord_index_ops.hpp b/include/boost/multi_index/detail/ord_index_ops.hpp index caa71aa..d42f5f1 100644 --- a/include/boost/multi_index/detail/ord_index_ops.hpp +++ b/include/boost/multi_index/detail/ord_index_ops.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -36,7 +36,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_OPS_HPP #define BOOST_MULTI_INDEX_DETAIL_ORD_INDEX_OPS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/prevent_eti.hpp b/include/boost/multi_index/detail/prevent_eti.hpp deleted file mode 100644 index 56c067a..0000000 --- a/include/boost/multi_index/detail/prevent_eti.hpp +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - * See http://www.boost.org/libs/multi_index for library home page. - */ - -#ifndef BOOST_MULTI_INDEX_DETAIL_PREVENT_ETI_HPP -#define BOOST_MULTI_INDEX_DETAIL_PREVENT_ETI_HPP - -#if defined(_MSC_VER)&&(_MSC_VER>=1200) -#pragma once -#endif - -#include /* keep it first to prevent nasty warns in MSVC */ -#include - -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) -#include -#include -#include -#endif - -namespace boost{ - -namespace multi_index{ - -namespace detail{ - -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) -/* See - * http://www.crystalclearsoftware.com/cgi-bin/boost_wiki/wiki.pl?Effective_MPL - * Item 5.6, Beware of the 'early template instantiation' trap. - */ - -template -struct prevent_eti -{ - typedef typename mpl::if_< - mpl::aux::msvc_never_true, - mpl::integral_c, - Construct - >::type type; -}; -#else -template -struct prevent_eti -{ - typedef Construct type; -}; -#endif - -} /* namespace multi_index::detail */ - -} /* namespace multi_index */ - -} /* namespace boost */ - -#endif diff --git a/include/boost/multi_index/detail/rnd_index_loader.hpp b/include/boost/multi_index/detail/rnd_index_loader.hpp index 793c521..4b00345 100644 --- a/include/boost/multi_index/detail/rnd_index_loader.hpp +++ b/include/boost/multi_index/detail/rnd_index_loader.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_RND_INDEX_LOADER_HPP #define BOOST_MULTI_INDEX_DETAIL_RND_INDEX_LOADER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -45,15 +44,12 @@ template class random_access_index_loader_base:private noncopyable { protected: - typedef typename prevent_eti< - Allocator, - random_access_index_node_impl< - typename boost::detail::allocator::rebind_to< - Allocator, - char - >::type - > - >::type node_impl_type; + typedef random_access_index_node_impl< + typename boost::detail::allocator::rebind_to< + Allocator, + char + >::type + > node_impl_type; typedef typename node_impl_type::pointer node_impl_pointer; typedef random_access_index_ptr_array ptr_array; @@ -86,14 +82,14 @@ protected: } } - void rearrange(node_impl_pointer position,node_impl_pointer x) + void rearrange(node_impl_pointer position_,node_impl_pointer x) { preprocess(); /* only incur this penalty if rearrange() is ever called */ - if(position==node_impl_pointer(0))position=header; + if(position_==node_impl_pointer(0))position_=header; next(prev(x))=next(x); prev(next(x))=prev(x); - prev(x)=position; - next(x)=next(position); + prev(x)=position_; + next(x)=next(position_); next(prev(x))=prev(next(x))=x; } @@ -161,9 +157,10 @@ public: super(al_,ptrs_) {} - void rearrange(Node* position,Node *x) + void rearrange(Node* position_,Node *x) { - super::rearrange(position?position->impl():node_impl_pointer(0),x->impl()); + super::rearrange( + position_?position_->impl():node_impl_pointer(0),x->impl()); } }; diff --git a/include/boost/multi_index/detail/rnd_index_node.hpp b/include/boost/multi_index/detail/rnd_index_node.hpp index 43b2526..991f6da 100644 --- a/include/boost/multi_index/detail/rnd_index_node.hpp +++ b/include/boost/multi_index/detail/rnd_index_node.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_RND_INDEX_NODE_HPP #define BOOST_MULTI_INDEX_DETAIL_RND_INDEX_NODE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -30,24 +29,18 @@ namespace detail{ template struct random_access_index_node_impl { - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,random_access_index_node_impl - >::type - >::type::pointer pointer; - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,random_access_index_node_impl - >::type - >::type::const_pointer const_pointer; - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,pointer - >::type - >::type::pointer ptr_pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,random_access_index_node_impl + >::type::pointer pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,random_access_index_node_impl + >::type::const_pointer const_pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,pointer + >::type::pointer ptr_pointer; ptr_pointer& up(){return up_;} ptr_pointer up()const{return up_;} @@ -181,25 +174,19 @@ private: template struct random_access_index_node_trampoline: - prevent_eti< - Super, - random_access_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type + random_access_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > { - typedef typename prevent_eti< - Super, - random_access_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type impl_type; + typedef random_access_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > impl_type; }; template diff --git a/include/boost/multi_index/detail/rnd_index_ops.hpp b/include/boost/multi_index/detail/rnd_index_ops.hpp index 5bf1ade..6cb030f 100644 --- a/include/boost/multi_index/detail/rnd_index_ops.hpp +++ b/include/boost/multi_index/detail/rnd_index_ops.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2009 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_RND_INDEX_OPS_HPP #define BOOST_MULTI_INDEX_DETAIL_RND_INDEX_OPS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -30,8 +30,7 @@ namespace detail{ template Node* random_access_index_remove( - random_access_index_ptr_array& ptrs,Predicate pred - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) + random_access_index_ptr_array& ptrs,Predicate pred) { typedef typename Node::value_type value_type; typedef typename Node::impl_ptr_pointer impl_ptr_pointer; @@ -55,8 +54,7 @@ Node* random_access_index_remove( template Node* random_access_index_unique( - random_access_index_ptr_array& ptrs,BinaryPredicate binary_pred - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) + random_access_index_ptr_array& ptrs,BinaryPredicate binary_pred) { typedef typename Node::value_type value_type; typedef typename Node::impl_ptr_pointer impl_ptr_pointer; @@ -86,8 +84,7 @@ template void random_access_index_inplace_merge( const Allocator& al, random_access_index_ptr_array& ptrs, - BOOST_DEDUCED_TYPENAME Node::impl_ptr_pointer first1,Compare comp - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) + BOOST_DEDUCED_TYPENAME Node::impl_ptr_pointer first1,Compare comp) { typedef typename Node::value_type value_type; typedef typename Node::impl_pointer impl_pointer; @@ -151,8 +148,7 @@ template void random_access_index_sort( const Allocator& al, random_access_index_ptr_array& ptrs, - Compare comp - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) + Compare comp) { /* The implementation is extremely simple: an auxiliary * array of pointers is sorted using stdlib facilities and diff --git a/include/boost/multi_index/detail/rnd_index_ptr_array.hpp b/include/boost/multi_index/detail/rnd_index_ptr_array.hpp index c1d9873..bae1c85 100644 --- a/include/boost/multi_index/detail/rnd_index_ptr_array.hpp +++ b/include/boost/multi_index/detail/rnd_index_ptr_array.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_RND_INDEX_PTR_ARRAY_HPP #define BOOST_MULTI_INDEX_DETAIL_RND_INDEX_PTR_ARRAY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -33,29 +32,23 @@ namespace detail{ template class random_access_index_ptr_array:private noncopyable { - typedef typename prevent_eti< - Allocator, - random_access_index_node_impl< - typename boost::detail::allocator::rebind_to< - Allocator, - char - >::type - > - >::type node_impl_type; + typedef random_access_index_node_impl< + typename boost::detail::allocator::rebind_to< + Allocator, + char + >::type + > node_impl_type; public: - typedef typename node_impl_type::pointer value_type; - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,value_type - >::type - >::type::pointer pointer; + typedef typename node_impl_type::pointer value_type; + typedef typename boost::detail::allocator::rebind_to< + Allocator,value_type + >::type::pointer pointer; random_access_index_ptr_array( - const Allocator& al,value_type end_,std::size_t size): - size_(size), - capacity_(size), + const Allocator& al,value_type end_,std::size_t sz): + size_(sz), + capacity_(sz), spc(al,capacity_+1) { *end()=end_; diff --git a/include/boost/multi_index/detail/rnd_node_iterator.hpp b/include/boost/multi_index/detail/rnd_node_iterator.hpp index 5ae3286..65bf5e8 100644 --- a/include/boost/multi_index/detail/rnd_node_iterator.hpp +++ b/include/boost/multi_index/detail/rnd_node_iterator.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_RND_NODE_ITERATOR_HPP #define BOOST_MULTI_INDEX_DETAIL_RND_NODE_ITERATOR_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/safe_ctr_proxy.hpp b/include/boost/multi_index/detail/safe_ctr_proxy.hpp deleted file mode 100644 index c733f96..0000000 --- a/include/boost/multi_index/detail/safe_ctr_proxy.hpp +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) - * - * See http://www.boost.org/libs/multi_index for library home page. - */ - -#ifndef BOOST_MULTI_INDEX_DETAIL_SAFE_CTR_PROXY_HPP -#define BOOST_MULTI_INDEX_DETAIL_SAFE_CTR_PROXY_HPP - -#if defined(_MSC_VER)&&(_MSC_VER>=1200) -#pragma once -#endif - -#if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#include /* keep it first to prevent nasty warns in MSVC */ -#include - -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) -#include - -namespace boost{ - -namespace multi_index{ - -namespace detail{ - -/* A safe iterator is instantiated in the form - * safe_iterator: MSVC++ 6.0 has serious troubles with - * the resulting symbols names, given that index names (which stand for - * Container) are fairly long themselves. safe_ctr_proxy does not statically - * depend on Container, and provides the necessary methods (begin and end) to - * the safe mode framework via an abstract interface. With safe_ctr_proxy, - * instead of deriving from safe_container the following base class - * must be used: - * - * safe_ctr_proxy_impl - * - * where Iterator is the type of the *unsafe* iterator being wrapped. - * The corresponding safe iterator instantiation is then - * - * safe_iterator >, - * - * which does not include the name of Container. - */ - -template -class safe_ctr_proxy: - public safe_mode::safe_container > -{ -public: - typedef safe_mode::safe_iterator iterator; - typedef iterator const_iterator; - - iterator begin(){return begin_impl();} - const_iterator begin()const{return begin_impl();} - iterator end(){return end_impl();} - const_iterator end()const{return end_impl();} - -protected: - virtual iterator begin_impl()=0; - virtual const_iterator begin_impl()const=0; - virtual iterator end_impl()=0; - virtual const_iterator end_impl()const=0; -}; - -template -class safe_ctr_proxy_impl:public safe_ctr_proxy -{ - typedef safe_ctr_proxy super; - typedef Container container_type; - -public: - typedef typename super::iterator iterator; - typedef typename super::const_iterator const_iterator; - - virtual iterator begin_impl(){return container().begin();} - virtual const_iterator begin_impl()const{return container().begin();} - virtual iterator end_impl(){return container().end();} - virtual const_iterator end_impl()const{return container().end();} - -private: - container_type& container() - { - return *static_cast(this); - } - - const container_type& container()const - { - return *static_cast(this); - } -}; - -} /* namespace multi_index::detail */ - -} /* namespace multi_index */ - -} /* namespace boost */ - -#endif /* workaround */ - -#endif /* BOOST_MULTI_INDEX_ENABLE_SAFE_MODE */ - -#endif diff --git a/include/boost/multi_index/detail/safe_mode.hpp b/include/boost/multi_index/detail/safe_mode.hpp index 4e4a585..905270e 100644 --- a/include/boost/multi_index/detail/safe_mode.hpp +++ b/include/boost/multi_index/detail/safe_mode.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_SAFE_MODE_HPP #define BOOST_MULTI_INDEX_DETAIL_SAFE_MODE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -116,6 +116,7 @@ #if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) #include +#include #endif #if defined(BOOST_HAS_THREADS) @@ -567,6 +568,19 @@ public: } /* namespace multi_index */ +#if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) +namespace serialization{ +template +struct version< + boost::multi_index::safe_mode::safe_iterator +> +{ + BOOST_STATIC_CONSTANT( + int,value=boost::serialization::version::value); +}; +} /* namespace serialization */ +#endif + } /* namespace boost */ #endif /* BOOST_MULTI_INDEX_ENABLE_SAFE_MODE */ diff --git a/include/boost/multi_index/detail/scope_guard.hpp b/include/boost/multi_index/detail/scope_guard.hpp index c64429e..116f8f5 100644 --- a/include/boost/multi_index/detail/scope_guard.hpp +++ b/include/boost/multi_index/detail/scope_guard.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_SCOPE_GUARD_HPP #define BOOST_MULTI_INDEX_DETAIL_SCOPE_GUARD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/seq_index_node.hpp b/include/boost/multi_index/detail/seq_index_node.hpp index cf409ed..5cb4676 100644 --- a/include/boost/multi_index/detail/seq_index_node.hpp +++ b/include/boost/multi_index/detail/seq_index_node.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,14 +9,13 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_SEQ_INDEX_NODE_HPP #define BOOST_MULTI_INDEX_DETAIL_SEQ_INDEX_NODE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif #include /* keep it first to prevent nasty warns in MSVC */ #include #include -#include namespace boost{ @@ -29,18 +28,14 @@ namespace detail{ template struct sequenced_index_node_impl { - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,sequenced_index_node_impl - >::type - >::type::pointer pointer; - typedef typename prevent_eti< - Allocator, - typename boost::detail::allocator::rebind_to< - Allocator,sequenced_index_node_impl - >::type - >::type::const_pointer const_pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,sequenced_index_node_impl + >::type::pointer pointer; + typedef typename + boost::detail::allocator::rebind_to< + Allocator,sequenced_index_node_impl + >::type::const_pointer const_pointer; pointer& prior(){return prior_;} pointer prior()const{return prior_;} @@ -136,25 +131,19 @@ private: template struct sequenced_index_node_trampoline: - prevent_eti< - Super, - sequenced_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type + sequenced_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > { - typedef typename prevent_eti< - Super, - sequenced_index_node_impl< - typename boost::detail::allocator::rebind_to< - typename Super::allocator_type, - char - >::type - > - >::type impl_type; + typedef sequenced_index_node_impl< + typename boost::detail::allocator::rebind_to< + typename Super::allocator_type, + char + >::type + > impl_type; }; template diff --git a/include/boost/multi_index/detail/seq_index_ops.hpp b/include/boost/multi_index/detail/seq_index_ops.hpp index 8135074..56da408 100644 --- a/include/boost/multi_index/detail/seq_index_ops.hpp +++ b/include/boost/multi_index/detail/seq_index_ops.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_SEQ_INDEX_OPS_HPP #define BOOST_MULTI_INDEX_DETAIL_SEQ_INDEX_OPS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -79,8 +79,7 @@ template void sequenced_index_collate( BOOST_DEDUCED_TYPENAME Node::impl_type* x, BOOST_DEDUCED_TYPENAME Node::impl_type* y, - Compare comp - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node)) + Compare comp) { typedef typename Node::impl_type impl_type; typedef typename Node::impl_pointer impl_pointer; diff --git a/include/boost/multi_index/detail/serialization_version.hpp b/include/boost/multi_index/detail/serialization_version.hpp index cced78c..ccd8bb4 100644 --- a/include/boost/multi_index/detail/serialization_version.hpp +++ b/include/boost/multi_index/detail/serialization_version.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2010 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_SERIALIZATION_VERSION_HPP #define BOOST_MULTI_INDEX_DETAIL_SERIALIZATION_VERSION_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -60,7 +60,6 @@ private: } /* namespace multi_index */ -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) namespace serialization { template struct version > @@ -68,7 +67,6 @@ struct version > BOOST_STATIC_CONSTANT(int,value=version::value); }; } /* namespace serialization */ -#endif } /* namespace boost */ diff --git a/include/boost/multi_index/detail/uintptr_type.hpp b/include/boost/multi_index/detail/uintptr_type.hpp index 529c623..9c92d01 100644 --- a/include/boost/multi_index/detail/uintptr_type.hpp +++ b/include/boost/multi_index/detail/uintptr_type.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_UINTPTR_TYPE_HPP #define BOOST_MULTI_INDEX_DETAIL_UINTPTR_TYPE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/unbounded.hpp b/include/boost/multi_index/detail/unbounded.hpp index 40c3034..dc09be1 100644 --- a/include/boost/multi_index/detail/unbounded.hpp +++ b/include/boost/multi_index/detail/unbounded.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_UNBOUNDED_HPP #define BOOST_MULTI_INDEX_DETAIL_UNBOUNDED_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -22,22 +22,6 @@ namespace multi_index{ /* dummy type and variable for use in ordered_index::range() */ -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) -/* The default branch actually works for MSVC 6.0, but seems like - * this implementation of unbounded improves the performance of ordered - * indices! This behavior is hard to explain and probably a test artifact, - * but it does not hurt to have the workaround anyway. - */ - -namespace detail{struct unbounded_type{};} - -namespace{ - -static detail::unbounded_type unbounded_obj=detail::unbounded_type(); -static detail::unbounded_type& unbounded=unbounded_obj; - -} /* unnamed */ -#else /* ODR-abiding technique shown at the example attached to * http://lists.boost.org/Archives/boost/2006/07/108355.php */ @@ -63,7 +47,6 @@ inline detail::unbounded_helper unbounded(detail::unbounded_helper) { return detail::unbounded_helper(); } -#endif /* tags used in the implementation of range */ diff --git a/include/boost/multi_index/detail/value_compare.hpp b/include/boost/multi_index/detail/value_compare.hpp index 0bd7b4f..1fde205 100644 --- a/include/boost/multi_index/detail/value_compare.hpp +++ b/include/boost/multi_index/detail/value_compare.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_VALUE_COMPARE_HPP #define BOOST_MULTI_INDEX_DETAIL_VALUE_COMPARE_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/detail/vartempl_support.hpp b/include/boost/multi_index/detail/vartempl_support.hpp index f6db6bf..06ff430 100644 --- a/include/boost/multi_index/detail/vartempl_support.hpp +++ b/include/boost/multi_index/detail/vartempl_support.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_DETAIL_VARTEMPL_SUPPORT_HPP #define BOOST_MULTI_INDEX_DETAIL_VARTEMPL_SUPPORT_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/global_fun.hpp b/include/boost/multi_index/global_fun.hpp index 8520e4d..9333f58 100644 --- a/include/boost/multi_index/global_fun.hpp +++ b/include/boost/multi_index/global_fun.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_GLOBAL_FUN_HPP #define BOOST_MULTI_INDEX_GLOBAL_FUN_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -46,16 +46,6 @@ namespace detail{ * arbitrary combinations of these (vg. T** or auto_ptr.) */ -/* NB. Some overloads of operator() have an extra dummy parameter int=0. - * This disambiguator serves several purposes: - * - Without it, MSVC++ 6.0 incorrectly regards some overloads as - * specializations of a previous member function template. - * - MSVC++ 6.0/7.0 seem to incorrectly treat some different memfuns - * as if they have the same signature. - * - If remove_const is broken due to lack of PTS, int=0 avoids the - * declaration of memfuns with identical signature. - */ - template struct const_ref_global_fun_base { @@ -90,7 +80,7 @@ struct const_ref_global_fun_base Type operator()( const reference_wrapper< typename remove_const< - typename remove_reference::type>::type>& x,int=0)const + typename remove_reference::type>::type>& x)const { return operator()(x.get()); } @@ -158,8 +148,7 @@ struct non_ref_global_fun_base } Type operator()( - const reference_wrapper< - typename remove_const::type>& x,int=0)const + const reference_wrapper::type>& x)const { return operator()(x.get()); } diff --git a/include/boost/multi_index/hashed_index.hpp b/include/boost/multi_index/hashed_index.hpp index ef02eb1..549bbef 100644 --- a/include/boost/multi_index/hashed_index.hpp +++ b/include/boost/multi_index/hashed_index.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_HASHED_INDEX_HPP #define BOOST_MULTI_INDEX_HASHED_INDEX_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -31,14 +32,16 @@ #include #include #include -#include #include #include #include #include #include +#include +#include #include #include +#include #include #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) @@ -71,12 +74,9 @@ namespace detail{ /* Most of the implementation of unique and non-unique indices is * shared. We tell from one another on instantiation time by using - * these tags. + * Category tags defined in hash_index_node.hpp. */ -struct hashed_unique_tag{}; -struct hashed_non_unique_tag{}; - template< typename KeyFromValue,typename Hash,typename Pred, typename SuperMeta,typename TagList,typename Category @@ -85,17 +85,9 @@ class hashed_index: BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS SuperMeta::type #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - ,public safe_ctr_proxy_impl< - hashed_index_iterator< - hashed_index_node, - bucket_array >, - hashed_index > -#else ,public safe_mode::safe_container< hashed_index > #endif -#endif { #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ @@ -112,11 +104,13 @@ class hashed_index: protected: typedef hashed_index_node< - typename super::node_type> node_type; + typename super::node_type,Category> node_type; private: + typedef typename node_type::node_alg node_alg; typedef typename node_type::impl_type node_impl_type; typedef typename node_impl_type::pointer node_impl_pointer; + typedef typename node_impl_type::base_pointer node_impl_base_pointer; typedef bucket_array< typename super::final_allocator_type> bucket_array_type; @@ -139,28 +133,24 @@ public: typedef std::ptrdiff_t difference_type; #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) typedef safe_mode::safe_iterator< hashed_index_iterator< - node_type,bucket_array_type>, - safe_ctr_proxy< - hashed_index_iterator< - node_type,bucket_array_type> > > iterator; -#else - typedef safe_mode::safe_iterator< - hashed_index_iterator< - node_type,bucket_array_type>, + node_type,bucket_array_type, + hashed_index_global_iterator_tag>, hashed_index> iterator; -#endif #else typedef hashed_index_iterator< - node_type,bucket_array_type> iterator; + node_type,bucket_array_type, + hashed_index_global_iterator_tag> iterator; #endif typedef iterator const_iterator; - typedef iterator local_iterator; - typedef const_iterator const_local_iterator; + typedef hashed_index_iterator< + node_type,bucket_array_type, + hashed_index_local_iterator_tag> local_iterator; + typedef local_iterator const_local_iterator; + typedef TagList tag_list; protected: @@ -186,15 +176,8 @@ protected: private: #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_ctr_proxy_impl< - hashed_index_iterator< - node_type,bucket_array_type>, - hashed_index> safe_super; -#else typedef safe_mode::safe_container< hashed_index> safe_super; -#endif #endif typedef typename call_traits::param_type value_param_type; @@ -230,36 +213,27 @@ public: } #endif - allocator_type get_allocator()const + allocator_type get_allocator()const BOOST_NOEXCEPT { return this->final().get_allocator(); } /* size and capacity */ - bool empty()const{return this->final_empty_();} - size_type size()const{return this->final_size_();} - size_type max_size()const{return this->final_max_size_();} + bool empty()const BOOST_NOEXCEPT{return this->final_empty_();} + size_type size()const BOOST_NOEXCEPT{return this->final_size_();} + size_type max_size()const BOOST_NOEXCEPT{return this->final_max_size_();} /* iterators */ - iterator begin() - { - return make_iterator( - node_type::from_impl(buckets.at(first_bucket)->next())); - } - - const_iterator begin()const - { - return make_iterator( - node_type::from_impl(buckets.at(first_bucket)->next())); - } - - iterator end(){return make_iterator(header());} - const_iterator end()const{return make_iterator(header());} - - const_iterator cbegin()const{return begin();} - const_iterator cend()const{return end();} + iterator begin()BOOST_NOEXCEPT + {return make_iterator(node_type::from_impl(header()->next()));} + const_iterator begin()const BOOST_NOEXCEPT + {return make_iterator(node_type::from_impl(header()->next()));} + iterator end()BOOST_NOEXCEPT{return make_iterator(header());} + const_iterator end()const BOOST_NOEXCEPT{return make_iterator(header());} + const_iterator cbegin()const BOOST_NOEXCEPT{return begin();} + const_iterator cend()const BOOST_NOEXCEPT{return end();} iterator iterator_to(const value_type& x) { @@ -341,28 +315,27 @@ public: { BOOST_MULTI_INDEX_HASHED_INDEX_CHECK_INVARIANT; - size_type s=0; std::size_t buc=buckets.position(hash_(k)); - node_impl_pointer x=buckets.at(buc); - node_impl_pointer y=x->next(); - while(y!=x){ - if(eq_(k,key(node_type::from_impl(y)->value()))){ - bool b; - do{ - node_impl_pointer z=y->next(); - b=z!=x&&eq_( - key(node_type::from_impl(y)->value()), - key(node_type::from_impl(z)->value())); - this->final_erase_( - static_cast(node_type::from_impl(y))); - y=z; - ++s; - }while(b); - break; - } - y=y->next(); + node_impl_pointer x=buckets.at(buc)->next(); + if(x!=node_impl_pointer(0)){ + x=x->next(); + do{ + if(eq_(k,key(node_type::from_impl(x)->value()))){ + node_impl_pointer y=end_of_range(x); + size_type s=0; + do{ + node_impl_pointer z=node_alg::after(x); + this->final_erase_( + static_cast(node_type::from_impl(x))); + x=z; + ++s; + }while(x!=y); + return s; + } + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } - return s; + return 0; } iterator erase(iterator first,iterator last) @@ -421,7 +394,7 @@ public: } template - bool modify(iterator position,Modifier mod,Rollback back) + bool modify(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -438,7 +411,7 @@ public: #endif return this->final_modify_( - mod,back,static_cast(position.get_node())); + mod,back_,static_cast(position.get_node())); } template @@ -453,7 +426,7 @@ public: } template - bool modify_key(iterator position,Modifier mod,Rollback back) + bool modify_key(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -462,10 +435,10 @@ public: return modify( position, modify_key_adaptor(mod,key), - modify_key_adaptor(back,key)); + modify_key_adaptor(back_,key)); } - void clear() + void clear()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_HASHED_INDEX_CHECK_INVARIANT; this->final_clear_(); @@ -504,13 +477,15 @@ public: const CompatibleHash& hash,const CompatiblePred& eq)const { std::size_t buc=buckets.position(hash(k)); - node_impl_pointer x=buckets.at(buc); - node_impl_pointer y=x->next(); - while(y!=x){ - if(eq(k,key(node_type::from_impl(y)->value()))){ - return make_iterator(node_type::from_impl(y)); - } - y=y->next(); + node_impl_pointer x=buckets.at(buc)->next(); + if(x!=node_impl_pointer(0)){ + x=x->next(); + do{ + if(eq(k,key(node_type::from_impl(x)->value()))){ + return make_iterator(node_type::from_impl(x)); + } + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } return end(); } @@ -528,21 +503,24 @@ public: const CompatibleKey& k, const CompatibleHash& hash,const CompatiblePred& eq)const { - size_type res=0; std::size_t buc=buckets.position(hash(k)); - node_impl_pointer x=buckets.at(buc); - node_impl_pointer y=x->next(); - while(y!=x){ - if(eq(k,key(node_type::from_impl(y)->value()))){ - do{ - ++res; - y=y->next(); - }while(y!=x&&eq(k,key(node_type::from_impl(y)->value()))); - break; - } - y=y->next(); + node_impl_pointer x=buckets.at(buc)->next(); + if(x!=node_impl_pointer(0)){ + x=x->next(); + do{ + if(eq(k,key(node_type::from_impl(x)->value()))){ + size_type res=0; + node_impl_pointer y=end_of_range(x); + do{ + ++res; + x=node_alg::after(x); + }while(x!=y); + return res; + } + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } - return res; + return 0; } template @@ -559,42 +537,36 @@ public: const CompatibleHash& hash,const CompatiblePred& eq)const { std::size_t buc=buckets.position(hash(k)); - node_impl_pointer x=buckets.at(buc); - node_impl_pointer y=x->next(); - while(y!=x){ - if(eq(k,key(node_type::from_impl(y)->value()))){ - node_impl_pointer y0=y; - do{ - y=y->next(); - }while(y!=x&&eq(k,key(node_type::from_impl(y)->value()))); - if(y==x){ - do{ - ++y; - }while(y==y->next()); - y=y->next(); + node_impl_pointer x=buckets.at(buc)->next(); + if(x!=node_impl_pointer(0)){ + x=x->next(); + do{ + if(eq(k,key(node_type::from_impl(x)->value()))){ + return std::pair( + make_iterator(node_type::from_impl(x)), + make_iterator(node_type::from_impl(end_of_range(x)))); } - return std::pair( - make_iterator(node_type::from_impl(y0)), - make_iterator(node_type::from_impl(y))); - } - y=y->next(); + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } return std::pair(end(),end()); } /* bucket interface */ - size_type bucket_count()const{return buckets.size();} - size_type max_bucket_count()const{return static_cast(-1);} + size_type bucket_count()const BOOST_NOEXCEPT{return buckets.size();} + size_type max_bucket_count()const BOOST_NOEXCEPT{return static_cast(-1);} size_type bucket_size(size_type n)const { size_type res=0; - node_impl_pointer x=buckets.at(n); - node_impl_pointer y=x->next(); - while(y!=x){ - ++res; - y=y->next(); + node_impl_pointer x=buckets.at(n)->next(); + if(x!=node_impl_pointer(0)){ + x=x->next(); + do{ + ++res; + x=node_alg::after(x); + }while(!node_alg::is_first_of_bucket(x)); } return res; } @@ -611,10 +583,9 @@ public: const_local_iterator begin(size_type n)const { - node_impl_pointer x=buckets.at(n); - node_impl_pointer y=x->next(); - if(y==x)return end(); - return make_iterator(node_type::from_impl(y)); + node_impl_pointer x=buckets.at(n)->next(); + if(x==node_impl_pointer(0))return end(n); + return make_local_iterator(node_type::from_impl(x->next())); } local_iterator end(size_type n) @@ -622,14 +593,9 @@ public: return const_cast(this)->end(n); } - const_local_iterator end(size_type n)const + const_local_iterator end(size_type)const { - node_impl_pointer x=buckets.at(n); - if(x==x->next())return end(); - do{ - ++x; - }while(x==x->next()); - return make_iterator(node_type::from_impl(x->next())); + return make_local_iterator(0); } const_local_iterator cbegin(size_type n)const{return begin(n);} @@ -637,24 +603,25 @@ public: local_iterator local_iterator_to(const value_type& x) { - return make_iterator(node_from_value(&x)); + return make_local_iterator(node_from_value(&x)); } const_local_iterator local_iterator_to(const value_type& x)const { - return make_iterator(node_from_value(&x)); + return make_local_iterator(node_from_value(&x)); } /* hash policy */ - float load_factor()const{return static_cast(size())/bucket_count();} - float max_load_factor()const{return mlf;} + float load_factor()const BOOST_NOEXCEPT + {return static_cast(size())/bucket_count();} + float max_load_factor()const BOOST_NOEXCEPT{return mlf;} void max_load_factor(float z){mlf=z;calculate_max_load();} void rehash(size_type n) { BOOST_MULTI_INDEX_HASHED_INDEX_CHECK_INVARIANT; - if(size()::max)(); float fbc=static_cast(1+size()/mlf); @@ -665,6 +632,11 @@ public: unchecked_rehash(bc); } + void reserve(size_type n) + { + rehash(static_cast(std::ceil(static_cast(n)/mlf))); + } + BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: hashed_index(const ctor_args_list& args_list,const allocator_type& al): super(args_list.get_tail(),al), @@ -672,8 +644,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: hash_(tuples::get<2>(args_list.get_head())), eq_(tuples::get<3>(args_list.get_head())), buckets(al,header()->impl(),tuples::get<0>(args_list.get_head())), - mlf(1.0f), - first_bucket(buckets.size()) + mlf(1.0f) { calculate_max_load(); } @@ -691,8 +662,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: eq_(x.eq_), buckets(x.get_allocator(),header()->impl(),x.buckets.size()), mlf(x.mlf), - max_load(x.max_load), - first_bucket(x.first_bucket) + max_load(x.max_load) { /* Copy ctor just takes the internal configuration objects from x. The rest * is done in subsequent call to copy_(). @@ -712,8 +682,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: hash_(x.hash_), eq_(x.eq_), buckets(x.get_allocator(),header()->impl(),0), - mlf(1.0f), - first_bucket(buckets.size()) + mlf(1.0f) { calculate_max_load(); } @@ -726,94 +695,161 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) iterator make_iterator(node_type* node) { - return iterator(node,&buckets,this); + return iterator(node,this); } const_iterator make_iterator(node_type* node)const { - return const_iterator( - node, - &const_cast(buckets), - const_cast(this)); + return const_iterator(node,const_cast(this)); } #else iterator make_iterator(node_type* node) { - return iterator(node,&buckets); + return iterator(node); } const_iterator make_iterator(node_type* node)const { - return const_iterator(node,&const_cast(buckets)); + return const_iterator(node); } #endif + local_iterator make_local_iterator(node_type* node) + { + return local_iterator(node); + } + + const_local_iterator make_local_iterator(node_type* node)const + { + return const_local_iterator(node); + } + void copy_( const hashed_index& x, const copy_map_type& map) { - for(node_impl_pointer begin_org=x.buckets.begin(), - begin_cpy=buckets.begin(), - end_org=x.buckets.end(); - begin_org!=end_org;++begin_org,++begin_cpy){ + copy_(x,map,Category()); + } - node_impl_pointer next_org=begin_org->next(); - node_impl_pointer cpy=begin_cpy; - while(next_org!=begin_org){ - cpy->next()= - static_cast( - map.find( - static_cast( - node_type::from_impl(next_org))))->impl(); - next_org=next_org->next(); - cpy=cpy->next(); - } - cpy->next()=begin_cpy; + void copy_( + const hashed_index& x, + const copy_map_type& map,hashed_unique_tag) + { + if(x.size()!=0){ + node_impl_pointer end_org=x.header()->impl(), + org=end_org, + cpy=header()->impl(); + do{ + node_impl_pointer next_org=org->next(), + next_cpy= + static_cast(map.find(static_cast( + node_type::from_impl(next_org))))->impl(); + cpy->next()=next_cpy; + if(node_alg::is_first_of_bucket(next_org)){ + node_impl_base_pointer buc_org=next_org->prior(), + buc_cpy= + buckets.begin()+(buc_org-x.buckets.begin()); + next_cpy->prior()=buc_cpy; + buc_cpy->next()=cpy; + } + else{ + next_cpy->prior()=node_impl_type::base_pointer_from(cpy); + } + org=next_org; + cpy=next_cpy; + }while(org!=end_org); } super::copy_(x,map); } - template - node_type* insert_(value_param_type v,node_type* x,Variant variant) + void copy_( + const hashed_index& x, + const copy_map_type& map,hashed_non_unique_tag) { - reserve(size()+1); - - std::size_t buc=find_bucket(v); - node_impl_pointer pos=buckets.at(buc); - if(!link_point(v,pos,Category()))return node_type::from_impl(pos); - - node_type* res=static_cast(super::insert_(v,x,variant)); - if(res==x){ - link(x,pos); - if(first_bucket>buc)first_bucket=buc; + if(x.size()!=0){ + node_impl_pointer end_org=x.header()->impl(), + org=end_org, + cpy=header()->impl(); + do{ + node_impl_pointer next_org=node_alg::after(org), + next_cpy= + static_cast(map.find(static_cast( + node_type::from_impl(next_org))))->impl(); + if(org->next()==next_org){ + cpy->next()=next_cpy; + if(node_alg::is_first_of_bucket(next_org)){ + node_impl_base_pointer buc_org=next_org->prior(), + buc_cpy= + buckets.begin()+(buc_org-x.buckets.begin()); + next_cpy->prior()=buc_cpy; + buc_cpy->next()=cpy; + } + else if(next_org->prior()!=node_impl_type::base_pointer_from(org)){ + next_cpy->prior()= + node_impl_type::base_pointer_from( + static_cast(map.find(static_cast( + node_type::from_impl( + node_impl_type::pointer_from(next_org->prior()) + ))))->impl()); + } + else{ + next_cpy->prior()=node_impl_type::base_pointer_from(cpy); + } + } + else{ + cpy->next()= + static_cast(map.find(static_cast( + node_type::from_impl(org->next()))))->impl(); + next_cpy->prior()=node_impl_type::base_pointer_from(cpy); + } + org=next_org; + cpy=next_cpy; + }while(org!=end_org); } + + super::copy_(x,map); + } + + template + final_node_type* insert_( + value_param_type v,final_node_type*& x,Variant variant) + { + reserve_for_insert(size()+1); + + std::size_t buc=find_bucket(v); + link_info pos(buckets.at(buc)); + if(!link_point(v,pos)){ + return static_cast( + node_type::from_impl(node_impl_type::pointer_from(pos))); + } + + final_node_type* res=super::insert_(v,x,variant); + if(res==x)link(static_cast(x),pos); return res; } template - node_type* insert_( - value_param_type v,node_type* position,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,node_type* position,final_node_type*& x,Variant variant) { - reserve(size()+1); + reserve_for_insert(size()+1); - std::size_t buc=find_bucket(v); - node_impl_pointer pos=buckets.at(buc); - if(!link_point(v,pos,Category()))return node_type::from_impl(pos); - - node_type* res= - static_cast(super::insert_(v,position,x,variant)); - if(res==x){ - link(x,pos); - if(first_bucket>buc)first_bucket=buc; + std::size_t buc=find_bucket(v); + link_info pos(buckets.at(buc)); + if(!link_point(v,pos)){ + return static_cast( + node_type::from_impl(node_impl_type::pointer_from(pos))); } + + final_node_type* res=super::insert_(v,position,x,variant); + if(res==x)link(static_cast(x),pos); return res; } void erase_(node_type* x) { unlink(x); - first_bucket=buckets.first_nonempty(first_bucket); super::erase_(x); #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) @@ -823,23 +859,43 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: void delete_all_nodes_() { - for(node_impl_pointer x=buckets.begin(),x_end=buckets.end(); - x!=x_end;++x){ + delete_all_nodes_(Category()); + } + + void delete_all_nodes_(hashed_unique_tag) + { + for(node_impl_pointer x_end=header()->impl(),x=x_end->next();x!=x_end;){ node_impl_pointer y=x->next(); - while(y!=x){ - node_impl_pointer z=y->next(); - this->final_delete_node_( - static_cast(node_type::from_impl(y))); - y=z; + this->final_delete_node_( + static_cast(node_type::from_impl(x))); + x=y; + } + } + + void delete_all_nodes_(hashed_non_unique_tag) + { + for(node_impl_pointer x_end=header()->impl(),x=x_end->next();x!=x_end;){ + node_impl_pointer y=x->next(); + if(node_alg::is_first_of_group(x)){ + /* Make the n-1 node next() pointer forward-linked so that it won't + * refer to a deleted node when the time for its own destruction comes. + * Relies on is_first_of_group(x) not visiting nodes previous to x. + */ + + node_impl_pointer last= + node_impl_type::pointer_from(x->next()->prior()); + last->prior()->next()=last; } + this->final_delete_node_( + static_cast(node_type::from_impl(x))); + x=y; } } void clear_() { super::clear_(); - buckets.clear(); - first_bucket=buckets.size(); + buckets.clear(header()->impl()); #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) safe_super::detach_dereferenceable_iterators(); @@ -855,7 +911,6 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: buckets.swap(x.buckets); std::swap(mlf,x.mlf); std::swap(max_load,x.max_load); - std::swap(first_bucket,x.first_bucket); #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) safe_super::swap(x); @@ -870,7 +925,6 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: buckets.swap(x.buckets); std::swap(mlf,x.mlf); std::swap(max_load,x.max_load); - std::swap(first_bucket,x.first_bucket); #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) safe_super::swap(x); @@ -885,28 +939,22 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: if(eq_(key(v),key(x->value()))){ return super::replace_(v,x,variant); } - - node_impl_pointer y=prev(x); - unlink_next(y); + + unlink_undo undo; + unlink(x,undo); BOOST_TRY{ - std::size_t buc=find_bucket(v); - node_impl_pointer pos=buckets.at(buc); - if(link_point(v,pos,Category())&&super::replace_(v,x,variant)){ + std::size_t buc=find_bucket(v); + link_info pos(buckets.at(buc)); + if(link_point(v,pos)&&super::replace_(v,x,variant)){ link(x,pos); - if(first_bucket>buc){ - first_bucket=buc; - } - else if(first_bucketvalue()); - b=in_place(x->impl(),key(x->value()),buc,Category()); + b=in_place(x->impl(),key(x->value()),buc); } BOOST_CATCH(...){ erase_(x); @@ -928,9 +976,8 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: if(!b){ unlink(x); BOOST_TRY{ - node_impl_pointer pos=buckets.at(buc); - if(!link_point(x->value(),pos,Category())){ - first_bucket=buckets.first_nonempty(first_bucket); + link_info pos(buckets.at(buc)); + if(!link_point(x->value(),pos)){ super::erase_(x); #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) @@ -939,15 +986,8 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: return false; } link(x,pos); - if(first_bucket>buc){ - first_bucket=buc; - } - else if(first_bucketvalue()); - if(in_place(x->impl(),key(x->value()),buc,Category())){ + if(in_place(x->impl(),key(x->value()),buc)){ return super::modify_rollback_(x); } - node_impl_pointer y=prev(x); - unlink_next(y); + unlink_undo undo; + unlink(x,undo); BOOST_TRY{ - node_impl_pointer pos=buckets.at(buc); - if(link_point(x->value(),pos,Category())&&super::modify_rollback_(x)){ + link_info pos(buckets.at(buc)); + if(link_point(x->value(),pos)&&super::modify_rollback_(x)){ link(x,pos); - if(first_bucket>buc){ - first_bucket=buc; - } - else if(first_bucket + friend bool operator==( + const hashed_index&,const hashed_index& y); +#endif + + bool equals(const hashed_index& x)const{return equals(x,Category());} + + bool equals(const hashed_index& x,hashed_unique_tag)const + { + if(size()!=x.size())return false; + for(const_iterator it=begin(),it_end=end(),it2_end=x.end(); + it!=it_end;++it){ + const_iterator it2=x.find(key(*it)); + if(it2==it2_end||!(*it==*it2))return false; + } + return true; + } + + bool equals(const hashed_index& x,hashed_non_unique_tag)const + { + if(size()!=x.size())return false; + for(const_iterator it=begin(),it_end=end();it!=it_end;){ + const_iterator it2,it2_last; + boost::tie(it2,it2_last)=x.equal_range(key(*it)); + if(it2==it2_last)return false; + + const_iterator it_last=make_iterator( + node_type::from_impl(end_of_range(it.get_node()->impl()))); + if(std::distance(it,it_last)!=std::distance(it2,it2_last))return false; + + /* From is_permutation code in + * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3068.pdf + */ + + for(;it!=it_last;++it,++it2){ + if(!(*it==*it2))break; + } + if(it!=it_last){ + for(const_iterator scan=it;scan!=it_last;++scan){ + if(std::find(it,scan,*scan)!=scan)continue; + std::ptrdiff_t matches=std::count(it2,it2_last,*scan); + if(matches==0||matches!=std::count(scan,it_last,*scan))return false; + } + it=it_last; + } + } + return true; + } + #if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) /* serialization */ @@ -1060,8 +1147,6 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: if(s1!=size())return false; } - if(first_bucket!=buckets.first_nonempty(0))return false; - return super::invariant_(); } @@ -1080,64 +1165,125 @@ private: return bucket(key(v)); } - bool link_point( - value_param_type v,node_impl_pointer& pos,hashed_unique_tag) + struct link_info_non_unique { - node_impl_pointer x=pos->next(); - while(x!=pos){ - if(eq_(key(v),key(node_type::from_impl(x)->value()))){ - pos=x; - return false; - } - x=x->next(); + link_info_non_unique(node_impl_base_pointer pos): + first(pos),last(node_impl_base_pointer(0)){} + + operator const node_impl_base_pointer&()const{return this->first;} + + node_impl_base_pointer first,last; + }; + + typedef typename mpl::if_< + is_same, + node_impl_base_pointer, + link_info_non_unique + >::type link_info; + + bool link_point(value_param_type v,link_info& pos) + { + return link_point(v,pos,Category()); + } + + bool link_point( + value_param_type v,node_impl_base_pointer& pos,hashed_unique_tag) + { + if(pos->next()!=node_impl_pointer(0)){ + node_impl_pointer x=pos->next()->next(); + do{ + if(eq_(key(v),key(node_type::from_impl(x)->value()))){ + pos=node_impl_type::base_pointer_from(x); + return false; + } + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } return true; } bool link_point( - value_param_type v,node_impl_pointer& pos,hashed_non_unique_tag) + value_param_type v,link_info_non_unique& pos,hashed_non_unique_tag) { - node_impl_pointer prev=pos; - node_impl_pointer x=pos->next(); - while(x!=pos){ - if(eq_(key(v),key(node_type::from_impl(x)->value()))){ - pos=prev; - return true; - } - prev=x; - x=x->next(); + if(pos.first->next()!=node_impl_pointer(0)){ + node_impl_pointer x=pos.first->next()->next(); + do{ + if(eq_(key(v),key(node_type::from_impl(x)->value()))){ + pos.first=node_impl_type::base_pointer_from(x); + pos.last=node_impl_type::base_pointer_from(last_of_range(x)); + return true; + } + x=node_alg::next_to_inspect(x); + }while(x!=node_impl_pointer(0)); } return true; } - - static void link(node_type* x,node_impl_pointer pos) - { - node_impl_type::link(x->impl(),pos); - }; - static void link(node_impl_pointer x,node_impl_pointer pos) + node_impl_pointer last_of_range(node_impl_pointer x)const { - node_impl_type::link(x,pos); - }; - - static void unlink(node_type* x) - { - node_impl_type::unlink(x->impl()); - }; - - static node_impl_pointer prev(node_type* x) - { - return node_impl_type::prev(x->impl()); + return last_of_range(x,Category()); } - static node_impl_pointer prev_from(node_type* x,node_impl_pointer y) + node_impl_pointer last_of_range(node_impl_pointer x,hashed_unique_tag)const { - return node_impl_type::prev_from(x->impl(),y); + return x; } - static void unlink_next(node_impl_pointer x) + node_impl_pointer last_of_range( + node_impl_pointer x,hashed_non_unique_tag)const { - node_impl_type::unlink_next(x); + node_impl_pointer y=x->next(); + node_impl_base_pointer z=y->prior(); + if(z->next()==x)return x; /* last of bucket */ + else if(z!=node_impl_type::base_pointer_from(x)){ + return node_impl_type::pointer_from(z); /* group of size>2 */ + } + else{ + return /* range of size 1 or 2 */ + eq_( + key(node_type::from_impl(x)->value()), + key(node_type::from_impl(y)->value()))?y:x; + } + } + + node_impl_pointer end_of_range(node_impl_pointer x)const + { + return last_of_range(x)->next(); + } + + void link(node_type* x,const link_info& pos) + { + link(x,pos,Category()); + } + + void link(node_type* x,node_impl_base_pointer pos,hashed_unique_tag) + { + node_alg::link(x->impl(),pos,header()->impl()); + } + + void link(node_type* x,const link_info_non_unique& pos,hashed_non_unique_tag) + { + if(pos.last==node_impl_base_pointer(0)){ + node_alg::link(x->impl(),pos.first,header()->impl()); + } + else{ + node_alg::link( + x->impl(), + node_impl_type::pointer_from(pos.first), + node_impl_type::pointer_from(pos.last)); + } + } + + void unlink(node_type* x) + { + node_alg::unlink(x->impl()); + } + + typedef typename node_alg::unlink_undo unlink_undo; + + void unlink(node_type* x,unlink_undo& undo) + { + node_alg::unlink(x->impl(),undo); } void calculate_max_load() @@ -1147,7 +1293,7 @@ private: if(max_load>fml)max_load=static_cast(fml); } - void reserve(size_type n) + void reserve_for_insert(size_type n) { if(n>max_load){ size_type bc =(std::numeric_limits::max)(); @@ -1157,102 +1303,165 @@ private: } } - void unchecked_rehash(size_type n) + void unchecked_rehash(size_type n){unchecked_rehash(n,Category());} + + void unchecked_rehash(size_type n,hashed_unique_tag) { - bucket_array_type buckets1(get_allocator(),header()->impl(),n); - auto_space hashes(get_allocator(),size()); + node_impl_type cpy_end_node; + node_impl_pointer cpy_end=node_impl_pointer(&cpy_end_node), + begin_=header()->next(), + end_=header()->impl(); + bucket_array_type buckets_cpy(get_allocator(),cpy_end,n); - std::size_t i=0; - node_impl_pointer x=buckets.begin(); - node_impl_pointer x_end=buckets.end(); - for(;x!=x_end;++x){ - node_impl_pointer y=x->next(); - while(y!=x){ - hashes.data()[i++]=hash_(key(node_type::from_impl(y)->value())); - y=y->next(); + if(size()!=0){ + auto_space hashes(get_allocator(),size()); + + std::size_t i=0; + node_impl_pointer x=header()->next(); + while(x!=end_){ + hashes.data()[i++]=hash_(key(node_type::from_impl(x)->value())); + x=x->next(); + } + + i=0; + x=begin_; + while(x!=end_){ + std::size_t h=hashes.data()[i++]; + node_impl_pointer y=x->next(); + node_alg::link(x,buckets_cpy.at(buckets_cpy.position(h)),cpy_end); + x=y; } } - i=0; - x=buckets.begin(); - for(;x!=x_end;++x){ - node_impl_pointer y=x->next(); - while(y!=x){ - node_impl_pointer z=y->next(); - std::size_t buc1=buckets1.position(hashes.data()[i++]); - node_impl_pointer x1=buckets1.at(buc1); - link(y,x1); - y=z; - } - } - - buckets.swap(buckets1); + end_->next()=cpy_end->next()!=cpy_end?cpy_end->next():end_; + end_->prior()=cpy_end->prior(); + end_->next()->prior()->next()=end_->prior()->next()->next()=end_; + buckets.swap(buckets_cpy); calculate_max_load(); - first_bucket=buckets.first_nonempty(0); + } + + void unchecked_rehash(size_type n,hashed_non_unique_tag) + { + node_impl_type cpy_end_node; + node_impl_pointer cpy_end=node_impl_pointer(&cpy_end_node), + begin_=header()->next(), + end_=header()->impl(); + bucket_array_type buckets_cpy(get_allocator(),cpy_end,n); + + if(size()!=0){ + auto_space< + std::size_t,allocator_type> hashes(get_allocator(),size()); + auto_space< + node_impl_pointer, + allocator_type> range_lasts(get_allocator(),size()); + + std::size_t i=0; + node_impl_pointer x=begin_; + while(x!=end_){ + hashes.data()[i]=hash_(key(node_type::from_impl(x)->value())); + x=last_of_range(x); + range_lasts.data()[i++]=x; + x=x->next(); + } + + i=0; + x=begin_; + while(x!=end_){ + std::size_t h=hashes.data()[i]; + node_impl_pointer last=range_lasts.data()[i++], + y=last->next(); + node_alg::link_range( + x,last,buckets_cpy.at(buckets_cpy.position(h)),cpy_end); + x=y; + } + } + + end_->next()=cpy_end->next()!=cpy_end?cpy_end->next():end_; + end_->prior()=cpy_end->prior(); + end_->next()->prior()->next()=end_->prior()->next()->next()=end_; + buckets.swap(buckets_cpy); + calculate_max_load(); + } + + bool in_place(node_impl_pointer x,key_param_type k,std::size_t buc)const + { + return in_place(x,k,buc,Category()); } bool in_place( node_impl_pointer x,key_param_type k,std::size_t buc, hashed_unique_tag)const { - std::less_equal leq; - node_impl_pointer bbegin=buckets.begin(); - node_impl_pointer bend=buckets.end(); - node_impl_pointer pbuc=x->next(); - - while(!leq(bbegin,pbuc)||!leq(pbuc,bend))pbuc=pbuc->next(); - if(buc!=static_cast(pbuc-bbegin))return false; - - node_impl_pointer y=x; - while(y->next()!=x){ + bool found=false; + node_impl_pointer y=buckets.at(buc)->next(); + if(y!=node_impl_pointer(0)){ y=y->next(); - if(y==pbuc)continue; - if(eq_(k,key(node_type::from_impl(y)->value())))return false; + do{ + if(y==x)found=true; + else if(eq_(k,key(node_type::from_impl(y)->value())))return false; + y=y->next(); + }while(!node_alg::is_first_of_bucket(y)); } - return true; + return found; } bool in_place( node_impl_pointer x,key_param_type k,std::size_t buc, hashed_non_unique_tag)const { - std::less_equal leq; - node_impl_pointer bbegin=buckets.begin(); - node_impl_pointer bend=buckets.end(); - node_impl_pointer pbuc=x->next(); - - while(!leq(bbegin,pbuc)||!leq(pbuc,bend))pbuc=pbuc->next(); - if(buc!=static_cast(pbuc-bbegin))return false; - - node_impl_pointer y=x->next(); - if(y!=pbuc){ - if(eq_(k,key(node_type::from_impl(y)->value()))){ - /* adjacent to equivalent element -> in place */ - return true; - } - else{ - y=y->next(); - while(y!=pbuc){ - if(eq_(k,key(node_type::from_impl(y)->value())))return false; - y=y->next(); - } - } - } - while(y->next()!=x){ + bool found=false; + node_impl_pointer y=buckets.at(buc)->next(); + if(y!=node_impl_pointer(0)){ + int range_size=0; y=y->next(); - if(eq_(k,key(node_type::from_impl(y)->value()))){ - while(y->next()!=x){ - y=y->next(); - if(!eq_(k,key(node_type::from_impl(y)->value())))return false; + do{ + if(node_alg::is_first_of_group(y)){ /* group of 3 or more */ + if(y==x){ + /* in place <-> equal to some other member of the group */ + return eq_(k,key(node_type::from_impl(y->next())->value())); + } + else{ + node_impl_pointer z=y->next()->prior()->next(); /* end of range */ + if(eq_(k,key(node_type::from_impl(y)->value()))){ + if(found)return false; /* x lies outside */ + do{ + if(y==x)return true; + y=node_alg::after(y); + }while(y!=z); + return false; /* x not found */ + } + else{ + if(range_size==1&&!found)return false; + if(range_size==2)return found; + range_size=0; + y=z; /* skip range (and potentially x, too, which is fine) */ + } + } } - /* after a group of equivalent elements --> in place */ - return true; - } + else{ /* group of 1 or 2 */ + if(y==x){ + if(range_size==1)return true; + range_size=1; + found=true; + } + else if(eq_(k,key(node_type::from_impl(y)->value()))){ + if(range_size==0&&found)return false; + if(range_size==1&&!found)return false; + if(range_size==2)return false; + ++range_size; + } + else{ + if(range_size==1&&!found)return false; + if(range_size==2)return found; + range_size=0; + } + y=y->next(); /* ~ y=node_alg::after(y) outside groups of 3 or more */ + } + }while(!node_alg::is_first_of_bucket(y)); } - return true; + return found; } - #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) void detach_iterators(node_type* x) { @@ -1290,7 +1499,6 @@ private: bucket_array_type buckets; float mlf; size_type max_load; - std::size_t first_bucket; #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ BOOST_WORKAROUND(__MWERKS__,<=0x3003) @@ -1298,6 +1506,30 @@ private: #endif }; +/* comparison */ + +template< + typename KeyFromValue,typename Hash,typename Pred, + typename SuperMeta,typename TagList,typename Category +> +bool operator==( + const hashed_index& x, + const hashed_index& y) +{ + return x.equals(y); +} + +template< + typename KeyFromValue,typename Hash,typename Pred, + typename SuperMeta,typename TagList,typename Category +> +bool operator!=( + const hashed_index& x, + const hashed_index& y) +{ + return !(x==y); +} + /* specialized algorithms */ template< @@ -1328,7 +1560,7 @@ struct hashed_unique template struct node_class { - typedef detail::hashed_index_node type; + typedef detail::hashed_index_node type; }; template @@ -1353,7 +1585,8 @@ struct hashed_non_unique template struct node_class { - typedef detail::hashed_index_node type; + typedef detail::hashed_index_node< + Super,detail::hashed_non_unique_tag> type; }; template diff --git a/include/boost/multi_index/hashed_index_fwd.hpp b/include/boost/multi_index/hashed_index_fwd.hpp index cd8c227..d77e36c 100644 --- a/include/boost/multi_index/hashed_index_fwd.hpp +++ b/include/boost/multi_index/hashed_index_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_HASHED_INDEX_FWD_HPP #define BOOST_MULTI_INDEX_HASHED_INDEX_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -27,6 +27,22 @@ template< > class hashed_index; +template< + typename KeyFromValue,typename Hash,typename Pred, + typename SuperMeta,typename TagList,typename Category +> +bool operator==( + const hashed_index& x, + const hashed_index& y); + +template< + typename KeyFromValue,typename Hash,typename Pred, + typename SuperMeta,typename TagList,typename Category +> +bool operator!=( + const hashed_index& x, + const hashed_index& y); + template< typename KeyFromValue,typename Hash,typename Pred, typename SuperMeta,typename TagList,typename Category diff --git a/include/boost/multi_index/identity.hpp b/include/boost/multi_index/identity.hpp index b402ad7..1dbaf3b 100644 --- a/include/boost/multi_index/identity.hpp +++ b/include/boost/multi_index/identity.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_IDENTITY_HPP #define BOOST_MULTI_INDEX_IDENTITY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -42,16 +42,6 @@ namespace detail{ * arbitrary combinations of these (vg. Type** or auto_ptr.) */ -/* NB. Some overloads of operator() have an extra dummy parameter int=0. - * This disambiguator serves several purposes: - * - Without it, MSVC++ 6.0 incorrectly regards some overloads as - * specializations of a previous member function template. - * - MSVC++ 6.0/7.0 seem to incorrectly treat some different memfuns - * as if they have the same signature. - * - If remove_const is broken due to lack of PTS, int=0 avoids the - * declaration of memfuns with identical signature. - */ - template struct const_identity_base { @@ -81,7 +71,7 @@ struct const_identity_base } Type& operator()( - const reference_wrapper::type>& x,int=0)const + const reference_wrapper::type>& x)const { return x.get(); } @@ -108,7 +98,7 @@ struct non_const_identity_base return operator()(*x); } - const Type& operator()(const Type& x,int=0)const + const Type& operator()(const Type& x)const { return x; } @@ -118,7 +108,7 @@ struct non_const_identity_base return x; } - const Type& operator()(const reference_wrapper& x,int=0)const + const Type& operator()(const reference_wrapper& x)const { return x.get(); } diff --git a/include/boost/multi_index/identity_fwd.hpp b/include/boost/multi_index/identity_fwd.hpp index baafa43..af6bd55 100644 --- a/include/boost/multi_index/identity_fwd.hpp +++ b/include/boost/multi_index/identity_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_IDENTITY_FWD_HPP #define BOOST_MULTI_INDEX_IDENTITY_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/indexed_by.hpp b/include/boost/multi_index/indexed_by.hpp index 94a8dcb..d2217e3 100644 --- a/include/boost/multi_index/indexed_by.hpp +++ b/include/boost/multi_index/indexed_by.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_INDEXED_BY_HPP #define BOOST_MULTI_INDEX_INDEXED_BY_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -31,12 +31,8 @@ */ #if !defined(BOOST_MULTI_INDEX_LIMIT_INDEXED_BY_SIZE) -#if defined(BOOST_MSVC)&&(BOOST_MSVC<1300) -#define BOOST_MULTI_INDEX_LIMIT_INDEXED_BY_SIZE 5 -#else #define BOOST_MULTI_INDEX_LIMIT_INDEXED_BY_SIZE BOOST_MPL_LIMIT_VECTOR_SIZE #endif -#endif #if BOOST_MULTI_INDEX_LIMIT_INDEXED_BY_SIZE=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/mem_fun.hpp b/include/boost/multi_index/mem_fun.hpp index bb18c10..71fc217 100644 --- a/include/boost/multi_index/mem_fun.hpp +++ b/include/boost/multi_index/mem_fun.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_MEM_FUN_HPP #define BOOST_MULTI_INDEX_MEM_FUN_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -112,6 +112,9 @@ struct mem_fun * news:microsoft.public.vc.language, 21st nov 2002, * http://groups.google.com/groups? * hl=en&lr=&ie=UTF-8&selm=ukwvg3O0BHA.1512%40tkmsftngp05 + * + * MSVC++ 6.0 support has been dropped and [const_]mem_fun_explicit is + * deprecated. */ template< @@ -183,28 +186,18 @@ struct mem_fun_explicit } }; -/* BOOST_MULTI_INDEX_CONST_MEM_FUN and BOOST_MULTI_INDEX_MEM_FUN resolve to - * [const_]mem_fun_explicit for MSVC++ 6.0 and to [const_]mem_fun otherwise. +/* BOOST_MULTI_INDEX_CONST_MEM_FUN and BOOST_MULTI_INDEX_MEM_FUN used to + * resolve to [const_]mem_fun_explicit for MSVC++ 6.0 and to + * [const_]mem_fun otherwise. Support for this compiler having been dropped, + * they are now just wrappers over [const_]mem_fun kept for backwards- + * compatibility reasons. */ -#if defined(BOOST_MSVC)&&(BOOST_MSVC<1300) - -#define BOOST_MULTI_INDEX_CONST_MEM_FUN(Class,Type,MemberFunName) \ -::boost::multi_index::const_mem_fun_explicit<\ - Class,Type,Type (Class::*)()const,&Class::MemberFunName > -#define BOOST_MULTI_INDEX_MEM_FUN(Class,Type,MemberFunName) \ -::boost::multi_index::mem_fun_explicit<\ - Class,Type,Type (Class::*)(),&Class::MemberFunName > - -#else - #define BOOST_MULTI_INDEX_CONST_MEM_FUN(Class,Type,MemberFunName) \ ::boost::multi_index::const_mem_fun< Class,Type,&Class::MemberFunName > #define BOOST_MULTI_INDEX_MEM_FUN(Class,Type,MemberFunName) \ ::boost::multi_index::mem_fun< Class,Type,&Class::MemberFunName > -#endif - } /* namespace multi_index */ } /* namespace boost */ diff --git a/include/boost/multi_index/member.hpp b/include/boost/multi_index/member.hpp index 848e9b2..192cf1b 100644 --- a/include/boost/multi_index/member.hpp +++ b/include/boost/multi_index/member.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_MEMBER_HPP #define BOOST_MULTI_INDEX_MEMBER_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -41,16 +41,6 @@ namespace detail{ * arbitrary combinations of these (vg. T** or auto_ptr.) */ -/* NB. Some overloads of operator() have an extra dummy parameter int=0. - * This disambiguator serves several purposes: - * - Without it, MSVC++ 6.0 incorrectly regards some overloads as - * specializations of a previous member function template. - * - MSVC++ 6.0/7.0 seem to incorrectly treat some different memfuns - * as if they have the same signature. - * - If remove_const is broken due to lack of PTS, int=0 avoids the - * declaration of memfuns with identical signature. - */ - template struct const_member_base { @@ -80,7 +70,7 @@ struct const_member_base return operator()(x.get()); } - Type& operator()(const reference_wrapper& x,int=0)const + Type& operator()(const reference_wrapper& x)const { return operator()(x.get()); } @@ -105,7 +95,7 @@ struct non_const_member_base return operator()(*x); } - const Type& operator()(const Class& x,int=0)const + const Type& operator()(const Class& x)const { return x.*PtrToMember; } @@ -115,7 +105,7 @@ struct non_const_member_base return x.*PtrToMember; } - const Type& operator()(const reference_wrapper& x,int=0)const + const Type& operator()(const reference_wrapper& x)const { return operator()(x.get()); } @@ -152,6 +142,9 @@ namespace detail{ * Surprisingly enough, other compilers, like Intel C++ 7.0/7.1 and * Visual Age 6.0, have similar bugs. This replacement of member<> * can be used for them too. + * + * Support for such old compilers is dropped and + * [non_]const_member_offset_base is deprecated. */ template @@ -186,7 +179,7 @@ struct const_member_offset_base return operator()(x.get()); } - Type& operator()(const reference_wrapper& x,int=0)const + Type& operator()(const reference_wrapper& x)const { return operator()(x.get()); } @@ -211,7 +204,7 @@ struct non_const_member_offset_base return operator()(*x); } - const Type& operator()(const Class& x,int=0)const + const Type& operator()(const Class& x)const { return *static_cast( static_cast( @@ -226,7 +219,7 @@ struct non_const_member_offset_base static_cast(static_cast(&x))+OffsetOfMember)); } - const Type& operator()(const reference_wrapper& x,int=0)const + const Type& operator()(const reference_wrapper& x)const { return operator()(x.get()); } diff --git a/include/boost/multi_index/ordered_index.hpp b/include/boost/multi_index/ordered_index.hpp index 3dedbc1..9d80bcc 100644 --- a/include/boost/multi_index/ordered_index.hpp +++ b/include/boost/multi_index/ordered_index.hpp @@ -36,7 +36,7 @@ #ifndef BOOST_MULTI_INDEX_ORDERED_INDEX_HPP #define BOOST_MULTI_INDEX_ORDERED_INDEX_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include @@ -117,16 +116,9 @@ class ordered_index: BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS SuperMeta::type #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - ,public safe_ctr_proxy_impl< - bidir_node_iterator< - ordered_index_node >, - ordered_index > -#else ,public safe_mode::safe_container< ordered_index > #endif -#endif { #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ @@ -164,16 +156,9 @@ public: typedef typename allocator_type::const_reference const_reference; #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_mode::safe_iterator< - bidir_node_iterator, - safe_ctr_proxy< - bidir_node_iterator > > iterator; -#else typedef safe_mode::safe_iterator< bidir_node_iterator, ordered_index> iterator; -#endif #else typedef bidir_node_iterator iterator; #endif @@ -213,13 +198,7 @@ protected: private: #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_ctr_proxy_impl< - bidir_node_iterator, - ordered_index> safe_super; -#else typedef safe_mode::safe_container safe_super; -#endif #endif typedef typename call_traits< @@ -256,25 +235,37 @@ public: } #endif - allocator_type get_allocator()const + allocator_type get_allocator()const BOOST_NOEXCEPT { return this->final().get_allocator(); } /* iterators */ - iterator begin(){return make_iterator(leftmost());} - const_iterator begin()const{return make_iterator(leftmost());} - iterator end(){return make_iterator(header());} - const_iterator end()const{return make_iterator(header());} - reverse_iterator rbegin(){return make_reverse_iterator(end());} - const_reverse_iterator rbegin()const{return make_reverse_iterator(end());} - reverse_iterator rend(){return make_reverse_iterator(begin());} - const_reverse_iterator rend()const{return make_reverse_iterator(begin());} - const_iterator cbegin()const{return begin();} - const_iterator cend()const{return end();} - const_reverse_iterator crbegin()const{return rbegin();} - const_reverse_iterator crend()const{return rend();} + iterator + begin()BOOST_NOEXCEPT{return make_iterator(leftmost());} + const_iterator + begin()const BOOST_NOEXCEPT{return make_iterator(leftmost());} + iterator + end()BOOST_NOEXCEPT{return make_iterator(header());} + const_iterator + end()const BOOST_NOEXCEPT{return make_iterator(header());} + reverse_iterator + rbegin()BOOST_NOEXCEPT{return make_reverse_iterator(end());} + const_reverse_iterator + rbegin()const BOOST_NOEXCEPT{return make_reverse_iterator(end());} + reverse_iterator + rend()BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_reverse_iterator + rend()const BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_iterator + cbegin()const BOOST_NOEXCEPT{return begin();} + const_iterator + cend()const BOOST_NOEXCEPT{return end();} + const_reverse_iterator + crbegin()const BOOST_NOEXCEPT{return rbegin();} + const_reverse_iterator + crend()const BOOST_NOEXCEPT{return rend();} iterator iterator_to(const value_type& x) { @@ -288,9 +279,9 @@ public: /* capacity */ - bool empty()const{return this->final_empty_();} - size_type size()const{return this->final_size_();} - size_type max_size()const{return this->final_max_size_();} + bool empty()const BOOST_NOEXCEPT{return this->final_empty_();} + size_type size()const BOOST_NOEXCEPT{return this->final_size_();} + size_type max_size()const BOOST_NOEXCEPT{return this->final_max_size_();} /* modifiers */ @@ -431,7 +422,7 @@ public: } template - bool modify(iterator position,Modifier mod,Rollback back) + bool modify(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -448,7 +439,7 @@ public: #endif return this->final_modify_( - mod,back,static_cast(position.get_node())); + mod,back_,static_cast(position.get_node())); } template @@ -463,7 +454,7 @@ public: } template - bool modify_key(iterator position,Modifier mod,Rollback back) + bool modify_key(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -472,7 +463,7 @@ public: return modify( position, modify_key_adaptor(mod,key), - modify_key_adaptor(back,key)); + modify_key_adaptor(back_,key)); } void swap(ordered_index& x) @@ -482,7 +473,7 @@ public: this->final_swap_(x.final()); } - void clear() + void clear()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_ORD_INDEX_CHECK_INVARIANT; this->final_clear_(); @@ -709,32 +700,35 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: } template - node_type* insert_(value_param_type v,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,final_node_type*& x,Variant variant) { link_info inf; if(!link_point(key(v),inf,Category())){ - return node_type::from_impl(inf.pos); + return static_cast(node_type::from_impl(inf.pos)); } - node_type* res=static_cast(super::insert_(v,x,variant)); + final_node_type* res=super::insert_(v,x,variant); if(res==x){ - node_impl_type::link(x->impl(),inf.side,inf.pos,header()->impl()); + node_impl_type::link( + static_cast(x)->impl(),inf.side,inf.pos,header()->impl()); } return res; } template - node_type* insert_( - value_param_type v,node_type* position,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,node_type* position,final_node_type*& x,Variant variant) { link_info inf; if(!hinted_link_point(key(v),position,inf,Category())){ - return node_type::from_impl(inf.pos); + return static_cast(node_type::from_impl(inf.pos)); } - node_type* res=static_cast(super::insert_(v,position,x,variant)); + final_node_type* res=super::insert_(v,position,x,variant); if(res==x){ - node_impl_type::link(x->impl(),inf.side,inf.pos,header()->impl()); + node_impl_type::link( + static_cast(x)->impl(),inf.side,inf.pos,header()->impl()); } return res; } diff --git a/include/boost/multi_index/ordered_index_fwd.hpp b/include/boost/multi_index/ordered_index_fwd.hpp index 6288a71..dbd040f 100644 --- a/include/boost/multi_index/ordered_index_fwd.hpp +++ b/include/boost/multi_index/ordered_index_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_ORDERED_INDEX_FWD_HPP #define BOOST_MULTI_INDEX_ORDERED_INDEX_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/random_access_index.hpp b/include/boost/multi_index/random_access_index.hpp index 2460187..1b077ff 100644 --- a/include/boost/multi_index/random_access_index.hpp +++ b/include/boost/multi_index/random_access_index.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_RANDOM_ACCESS_INDEX_HPP #define BOOST_MULTI_INDEX_RANDOM_ACCESS_INDEX_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -81,16 +80,9 @@ class random_access_index: BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS SuperMeta::type #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - ,public safe_ctr_proxy_impl< - rnd_node_iterator< - random_access_index_node >, - random_access_index > -#else ,public safe_mode::safe_container< random_access_index > #endif -#endif { #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ @@ -125,16 +117,9 @@ public: typedef typename allocator_type::const_reference const_reference; #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_mode::safe_iterator< - rnd_node_iterator, - safe_ctr_proxy< - rnd_node_iterator > > iterator; -#else typedef safe_mode::safe_iterator< rnd_node_iterator, random_access_index> iterator; -#endif #else typedef rnd_node_iterator iterator; #endif @@ -174,14 +159,8 @@ protected: private: #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_ctr_proxy_impl< - rnd_node_iterator, - random_access_index> safe_super; -#else typedef safe_mode::safe_container< random_access_index> safe_super; -#endif #endif typedef typename call_traits< @@ -236,27 +215,37 @@ public: for(size_type i=0;ifinal().get_allocator(); } /* iterators */ - iterator begin() + iterator begin()BOOST_NOEXCEPT {return make_iterator(node_type::from_impl(*ptrs.begin()));} - const_iterator begin()const + const_iterator begin()const BOOST_NOEXCEPT {return make_iterator(node_type::from_impl(*ptrs.begin()));} - iterator end(){return make_iterator(header());} - const_iterator end()const{return make_iterator(header());} - reverse_iterator rbegin(){return make_reverse_iterator(end());} - const_reverse_iterator rbegin()const{return make_reverse_iterator(end());} - reverse_iterator rend(){return make_reverse_iterator(begin());} - const_reverse_iterator rend()const{return make_reverse_iterator(begin());} - const_iterator cbegin()const{return begin();} - const_iterator cend()const{return end();} - const_reverse_iterator crbegin()const{return rbegin();} - const_reverse_iterator crend()const{return rend();} + iterator + end()BOOST_NOEXCEPT{return make_iterator(header());} + const_iterator + end()const BOOST_NOEXCEPT{return make_iterator(header());} + reverse_iterator + rbegin()BOOST_NOEXCEPT{return make_reverse_iterator(end());} + const_reverse_iterator + rbegin()const BOOST_NOEXCEPT{return make_reverse_iterator(end());} + reverse_iterator + rend()BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_reverse_iterator + rend()const BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_iterator + cbegin()const BOOST_NOEXCEPT{return begin();} + const_iterator + cend()const BOOST_NOEXCEPT{return end();} + const_reverse_iterator + crbegin()const BOOST_NOEXCEPT{return rbegin();} + const_reverse_iterator + crend()const BOOST_NOEXCEPT{return rend();} iterator iterator_to(const value_type& x) { @@ -270,10 +259,10 @@ public: /* capacity */ - bool empty()const{return this->final_empty_();} - size_type size()const{return this->final_size_();} - size_type max_size()const{return this->final_max_size_();} - size_type capacity()const{return ptrs.capacity();} + bool empty()const BOOST_NOEXCEPT{return this->final_empty_();} + size_type size()const BOOST_NOEXCEPT{return this->final_size_();} + size_type max_size()const BOOST_NOEXCEPT{return this->final_max_size_();} + size_type capacity()const BOOST_NOEXCEPT{return ptrs.capacity();} void reserve(size_type n) { @@ -467,7 +456,7 @@ public: } template - bool modify(iterator position,Modifier mod,Rollback back) + bool modify(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -484,7 +473,7 @@ public: #endif return this->final_modify_( - mod,back,static_cast(position.get_node())); + mod,back_,static_cast(position.get_node())); } void swap(random_access_index& x) @@ -494,7 +483,7 @@ public: this->final_swap_(x.final()); } - void clear() + void clear()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_RND_INDEX_CHECK_INVARIANT; this->final_clear_(); @@ -665,7 +654,7 @@ public: get_allocator(),ptrs,comp); } - void reverse() + void reverse()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_RND_INDEX_CHECK_INVARIANT; node_impl_type::reverse(ptrs.begin(),ptrs.end()); @@ -781,22 +770,22 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: } template - node_type* insert_(value_param_type v,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,final_node_type*& x,Variant variant) { ptrs.room_for_one(); - node_type* res=static_cast(super::insert_(v,x,variant)); - if(res==x)ptrs.push_back(x->impl()); + final_node_type* res=super::insert_(v,x,variant); + if(res==x)ptrs.push_back(static_cast(x)->impl()); return res; } template - node_type* insert_( - value_param_type v,node_type* position,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,node_type* position,final_node_type*& x,Variant variant) { ptrs.room_for_one(); - node_type* res= - static_cast(super::insert_(v,position,x,variant)); - if(res==x)ptrs.push_back(x->impl()); + final_node_type* res=super::insert_(v,position,x,variant); + if(res==x)ptrs.push_back(static_cast(x)->impl()); return res; } diff --git a/include/boost/multi_index/random_access_index_fwd.hpp b/include/boost/multi_index/random_access_index_fwd.hpp index cf8f2ca..2ea1929 100644 --- a/include/boost/multi_index/random_access_index_fwd.hpp +++ b/include/boost/multi_index/random_access_index_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_RANDOM_ACCESS_INDEX_FWD_HPP #define BOOST_MULTI_INDEX_RANDOM_ACCESS_INDEX_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/safe_mode_errors.hpp b/include/boost/multi_index/safe_mode_errors.hpp index ff6f960..1904706 100644 --- a/include/boost/multi_index/safe_mode_errors.hpp +++ b/include/boost/multi_index/safe_mode_errors.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_SAFE_MODE_ERRORS_HPP #define BOOST_MULTI_INDEX_SAFE_MODE_ERRORS_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/sequenced_index.hpp b/include/boost/multi_index/sequenced_index.hpp index 7ea3c45..3235bc2 100644 --- a/include/boost/multi_index/sequenced_index.hpp +++ b/include/boost/multi_index/sequenced_index.hpp @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_SEQUENCED_INDEX_HPP #define BOOST_MULTI_INDEX_SEQUENCED_INDEX_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -75,16 +74,9 @@ class sequenced_index: BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS SuperMeta::type #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - ,public safe_ctr_proxy_impl< - bidir_node_iterator< - sequenced_index_node >, - sequenced_index > -#else ,public safe_mode::safe_container< sequenced_index > #endif -#endif { #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ @@ -116,16 +108,9 @@ public: typedef typename allocator_type::const_reference const_reference; #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_mode::safe_iterator< - bidir_node_iterator, - safe_ctr_proxy< - bidir_node_iterator > > iterator; -#else typedef safe_mode::safe_iterator< bidir_node_iterator, sequenced_index> iterator; -#endif #else typedef bidir_node_iterator iterator; #endif @@ -165,14 +150,8 @@ protected: private: #if defined(BOOST_MULTI_INDEX_ENABLE_SAFE_MODE) -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - typedef safe_ctr_proxy_impl< - bidir_node_iterator, - sequenced_index> safe_super; -#else typedef safe_mode::safe_container< sequenced_index> safe_super; -#endif #endif typedef typename call_traits::param_type value_param_type; @@ -226,27 +205,37 @@ public: for(size_type i=0;ifinal().get_allocator(); } /* iterators */ - iterator begin() + iterator begin()BOOST_NOEXCEPT {return make_iterator(node_type::from_impl(header()->next()));} - const_iterator begin()const + const_iterator begin()const BOOST_NOEXCEPT {return make_iterator(node_type::from_impl(header()->next()));} - iterator end(){return make_iterator(header());} - const_iterator end()const{return make_iterator(header());} - reverse_iterator rbegin(){return make_reverse_iterator(end());} - const_reverse_iterator rbegin()const{return make_reverse_iterator(end());} - reverse_iterator rend(){return make_reverse_iterator(begin());} - const_reverse_iterator rend()const{return make_reverse_iterator(begin());} - const_iterator cbegin()const{return begin();} - const_iterator cend()const{return end();} - const_reverse_iterator crbegin()const{return rbegin();} - const_reverse_iterator crend()const{return rend();} + iterator + end()BOOST_NOEXCEPT{return make_iterator(header());} + const_iterator + end()const BOOST_NOEXCEPT{return make_iterator(header());} + reverse_iterator + rbegin()BOOST_NOEXCEPT{return make_reverse_iterator(end());} + const_reverse_iterator + rbegin()const BOOST_NOEXCEPT{return make_reverse_iterator(end());} + reverse_iterator + rend()BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_reverse_iterator + rend()const BOOST_NOEXCEPT{return make_reverse_iterator(begin());} + const_iterator + cbegin()const BOOST_NOEXCEPT{return begin();} + const_iterator + cend()const BOOST_NOEXCEPT{return end();} + const_reverse_iterator + crbegin()const BOOST_NOEXCEPT{return rbegin();} + const_reverse_iterator + crend()const BOOST_NOEXCEPT{return rend();} iterator iterator_to(const value_type& x) { @@ -260,9 +249,9 @@ public: /* capacity */ - bool empty()const{return this->final_empty_();} - size_type size()const{return this->final_size_();} - size_type max_size()const{return this->final_max_size_();} + bool empty()const BOOST_NOEXCEPT{return this->final_empty_();} + size_type size()const BOOST_NOEXCEPT{return this->final_size_();} + size_type max_size()const BOOST_NOEXCEPT{return this->final_max_size_();} void resize(size_type n) { @@ -422,7 +411,7 @@ public: } template - bool modify(iterator position,Modifier mod,Rollback back) + bool modify(iterator position,Modifier mod,Rollback back_) { BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); @@ -439,7 +428,7 @@ public: #endif return this->final_modify_( - mod,back,static_cast(position.get_node())); + mod,back_,static_cast(position.get_node())); } void swap(sequenced_index& x) @@ -449,7 +438,7 @@ public: this->final_swap_(x.final()); } - void clear() + void clear()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_SEQ_INDEX_CHECK_INVARIANT; this->final_clear_(); @@ -571,7 +560,7 @@ public: sequenced_index_sort(header(),comp); } - void reverse() + void reverse()BOOST_NOEXCEPT { BOOST_MULTI_INDEX_SEQ_INDEX_CHECK_INVARIANT; node_impl_type::reverse(header()->impl()); @@ -679,20 +668,20 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: } template - node_type* insert_(value_param_type v,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,final_node_type*& x,Variant variant) { - node_type* res=static_cast(super::insert_(v,x,variant)); - if(res==x)link(x); + final_node_type* res=super::insert_(v,x,variant); + if(res==x)link(static_cast(x)); return res; } template - node_type* insert_( - value_param_type v,node_type* position,node_type* x,Variant variant) + final_node_type* insert_( + value_param_type v,node_type* position,final_node_type*& x,Variant variant) { - node_type* res= - static_cast(super::insert_(v,position,x,variant)); - if(res==x)link(x); + final_node_type* res=super::insert_(v,position,x,variant); + if(res==x)link(static_cast(x)); return res; } diff --git a/include/boost/multi_index/sequenced_index_fwd.hpp b/include/boost/multi_index/sequenced_index_fwd.hpp index 5211390..a019f2a 100644 --- a/include/boost/multi_index/sequenced_index_fwd.hpp +++ b/include/boost/multi_index/sequenced_index_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_SEQUENCED_INDEX_FWD_HPP #define BOOST_MULTI_INDEX_SEQUENCED_INDEX_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/multi_index/tag.hpp b/include/boost/multi_index/tag.hpp index ba7cab4..ce51f82 100644 --- a/include/boost/multi_index/tag.hpp +++ b/include/boost/multi_index/tag.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_TAG_HPP #define BOOST_MULTI_INDEX_TAG_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -34,12 +34,8 @@ */ #if !defined(BOOST_MULTI_INDEX_LIMIT_TAG_SIZE) -#if defined(BOOST_MSVC)&&(BOOST_MSVC<1300) -#define BOOST_MULTI_INDEX_LIMIT_TAG_SIZE 3 -#else #define BOOST_MULTI_INDEX_LIMIT_TAG_SIZE BOOST_MPL_LIMIT_VECTOR_SIZE #endif -#endif #if BOOST_MULTI_INDEX_LIMIT_TAG_SIZE=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -90,13 +89,10 @@ class multi_index_container: Value,IndexSpecifierList,Allocator>::type >::type>, BOOST_MULTI_INDEX_PRIVATE_IF_MEMBER_TEMPLATE_FRIENDS detail::header_holder< - typename detail::prevent_eti< + typename boost::detail::allocator::rebind_to< Allocator, - typename boost::detail::allocator::rebind_to< - Allocator, - typename detail::multi_index_node_type< - Value,IndexSpecifierList,Allocator>::type - >::type + typename detail::multi_index_node_type< + Value,IndexSpecifierList,Allocator>::type >::type::pointer, multi_index_container >, public detail::multi_index_base_type< @@ -125,52 +121,25 @@ private: Value,IndexSpecifierList,Allocator>::type super; typedef typename boost::detail::allocator::rebind_to< - Allocator, - typename super::node_type + Allocator, + typename super::node_type >::type node_allocator; typedef ::boost::base_from_member< node_allocator> bfm_allocator; typedef detail::header_holder< - typename detail::prevent_eti< - Allocator, - node_allocator - >::type::pointer, + typename node_allocator::pointer, multi_index_container> bfm_header; -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - /* see definition of index_type_list below */ - typedef typename super::index_type_list super_index_type_list; -#endif public: /* All types are inherited from super, a few are explicitly * brought forward here to save us some typename's. */ - typedef typename super::ctor_args_list ctor_args_list; - typedef IndexSpecifierList index_specifier_type_list; + typedef typename super::ctor_args_list ctor_args_list; + typedef IndexSpecifierList index_specifier_type_list; -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - /* MSVC++ 6.0 chokes on moderately long index lists (around 6 indices - * or more), with errors ranging from corrupt exes to duplicate - * comdats. The following type hiding hack alleviates this condition; - * best results combined with type hiding of the indexed_by construct - * itself, as explained in the "Compiler specifics" section of - * the documentation. - */ - - struct index_type_list:super_index_type_list - { - typedef index_type_list type; - typedef typename super_index_type_list::back back; - typedef mpl::v_iter begin; - typedef mpl::v_iter< - type, - mpl::size::value> end; - }; -#else typedef typename super::index_type_list index_type_list; -#endif typedef typename super::iterator_type_list iterator_type_list; typedef typename super::const_iterator_type_list const_iterator_type_list; @@ -375,7 +344,7 @@ public: } #endif - allocator_type get_allocator()const + allocator_type get_allocator()const BOOST_NOEXCEPT { return allocator_type(bfm_allocator::member); } @@ -391,15 +360,14 @@ public: }; template - typename nth_index::type& get(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) + typename nth_index::type& get()BOOST_NOEXCEPT { BOOST_STATIC_ASSERT(N>=0&&N::type::value); return *this; } template - const typename nth_index::type& get( - BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const + const typename nth_index::type& get()const BOOST_NOEXCEPT { BOOST_STATIC_ASSERT(N>=0&&N::type::value); return *this; @@ -425,14 +393,13 @@ public: }; template - typename index::type& get(BOOST_EXPLICIT_TEMPLATE_TYPE(Tag)) + typename index::type& get()BOOST_NOEXCEPT { return *this; } template - const typename index::type& get( - BOOST_EXPLICIT_TEMPLATE_TYPE(Tag))const + const typename index::type& get()const BOOST_NOEXCEPT { return *this; } @@ -454,11 +421,9 @@ public: }; template - typename nth_index_iterator::type project( - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) + typename nth_index_iterator::type project(IteratorType it) { - typedef typename nth_index::type index; + typedef typename nth_index::type index_type; #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ BOOST_STATIC_ASSERT( @@ -469,15 +434,13 @@ public: BOOST_MULTI_INDEX_CHECK_IS_OWNER( it,static_cast(*this)); - return index::make_iterator(static_cast(it.get_node())); + return index_type::make_iterator(static_cast(it.get_node())); } template - typename nth_index_const_iterator::type project( - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const + typename nth_index_const_iterator::type project(IteratorType it)const { - typedef typename nth_index::type index; + typedef typename nth_index::type index_type; #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ BOOST_STATIC_ASSERT(( @@ -488,7 +451,7 @@ public: BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); BOOST_MULTI_INDEX_CHECK_IS_OWNER( it,static_cast(*this)); - return index::make_iterator(static_cast(it.get_node())); + return index_type::make_iterator(static_cast(it.get_node())); } #endif @@ -508,11 +471,9 @@ public: }; template - typename index_iterator::type project( - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) + typename index_iterator::type project(IteratorType it) { - typedef typename index::type index; + typedef typename index::type index_type; #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ BOOST_STATIC_ASSERT( @@ -522,15 +483,13 @@ public: BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); BOOST_MULTI_INDEX_CHECK_IS_OWNER( it,static_cast(*this)); - return index::make_iterator(static_cast(it.get_node())); + return index_type::make_iterator(static_cast(it.get_node())); } template - typename index_const_iterator::type project( - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const + typename index_const_iterator::type project(IteratorType it)const { - typedef typename index::type index; + typedef typename index::type index_type; #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ BOOST_STATIC_ASSERT(( @@ -541,7 +500,7 @@ public: BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); BOOST_MULTI_INDEX_CHECK_IS_OWNER( it,static_cast(*this)); - return index::make_iterator(static_cast(it.get_node())); + return index_type::make_iterator(static_cast(it.get_node())); } #endif @@ -595,23 +554,15 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: template std::pair insert_(const Value& v,Variant variant) { - node_type* x=allocate_node(); - BOOST_TRY{ - node_type* res=super::insert_(v,x,variant); - if(res==x){ - ++node_count; - return std::pair(res,true); - } - else{ - deallocate_node(x); - return std::pair(res,false); - } + node_type* x=0; + node_type* res=super::insert_(v,x,variant); + if(res==x){ + ++node_count; + return std::pair(res,true); } - BOOST_CATCH(...){ - deallocate_node(x); - BOOST_RETHROW; + else{ + return std::pair(res,false); } - BOOST_CATCH_END } std::pair insert_(const Value& v) @@ -702,23 +653,15 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: std::pair insert_( const Value& v,node_type* position,Variant variant) { - node_type* x=allocate_node(); - BOOST_TRY{ - node_type* res=super::insert_(v,position,x,variant); - if(res==x){ - ++node_count; - return std::pair(res,true); - } - else{ - deallocate_node(x); - return std::pair(res,false); - } + node_type* x=0; + node_type* res=super::insert_(v,position,x,variant); + if(res==x){ + ++node_count; + return std::pair(res,true); } - BOOST_CATCH(...){ - deallocate_node(x); - BOOST_RETHROW; + else{ + return std::pair(res,false); } - BOOST_CATCH_END } std::pair insert_(const Value& v,node_type* position) @@ -886,7 +829,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: } template - bool modify_(Modifier& mod,Rollback& back,node_type* x) + bool modify_(Modifier& mod,Rollback& back_,node_type* x) { mod(const_cast(x->value())); @@ -896,7 +839,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: } BOOST_CATCH(...){ BOOST_TRY{ - back(const_cast(x->value())); + back_(const_cast(x->value())); BOOST_RETHROW; } BOOST_CATCH(...){ @@ -909,7 +852,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: BOOST_TRY{ if(!b){ - back(const_cast(x->value())); + back_(const_cast(x->value())); return false; } else return true; @@ -934,17 +877,10 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: template void save(Archive& ar,const unsigned int version)const { - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) const serialization::collection_size_type s(size_()); const detail::serialization_version value_version; ar< value_version; if(version<1){ @@ -982,11 +916,6 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS: else{ ar>>serialization::make_nvp("value_version",value_version); } -#else - std::size_t s; - unsigned int value_version=0; - ar>>serialization::make_nvp("count",s); -#endif index_loader_type lm(bfm_allocator::member,s); @@ -1050,8 +979,7 @@ template typename nth_index< multi_index_container,N>::type& get( - multi_index_container& m - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) + multi_index_container& m)BOOST_NOEXCEPT { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; @@ -1059,7 +987,7 @@ get( multi_index_container< Value,IndexSpecifierList,Allocator>, N - >::type index; + >::type index_type; BOOST_STATIC_ASSERT(N>=0&& N< @@ -1067,7 +995,7 @@ get( BOOST_DEDUCED_TYPENAME multi_index_type::index_type_list >::type::value); - return detail::converter::index(m); + return detail::converter::index(m); } template @@ -1075,7 +1003,7 @@ const typename nth_index< multi_index_container,N>::type& get( const multi_index_container& m - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) +)BOOST_NOEXCEPT { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; @@ -1083,7 +1011,7 @@ get( multi_index_container< Value,IndexSpecifierList,Allocator>, N - >::type index; + >::type index_type; BOOST_STATIC_ASSERT(N>=0&& N< @@ -1091,7 +1019,7 @@ get( BOOST_DEDUCED_TYPENAME multi_index_type::index_type_list >::type::value); - return detail::converter::index(m); + return detail::converter::index(m); } /* retrieval of indices by tag */ @@ -1119,8 +1047,7 @@ template< typename ::boost::multi_index::index< multi_index_container,Tag>::type& get( - multi_index_container& m - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) + multi_index_container& m)BOOST_NOEXCEPT { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; @@ -1128,9 +1055,9 @@ get( multi_index_container< Value,IndexSpecifierList,Allocator>, Tag - >::type index; + >::type index_type; - return detail::converter::index(m); + return detail::converter::index(m); } template< @@ -1140,7 +1067,7 @@ const typename ::boost::multi_index::index< multi_index_container,Tag>::type& get( const multi_index_container& m - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) +)BOOST_NOEXCEPT { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; @@ -1148,9 +1075,9 @@ get( multi_index_container< Value,IndexSpecifierList,Allocator>, Tag - >::type index; + >::type index_type; - return detail::converter::index(m); + return detail::converter::index(m); } /* projection of iterators by number */ @@ -1158,18 +1085,13 @@ get( template struct nth_index_iterator { - typedef typename detail::prevent_eti< - nth_index, - typename nth_index::type>::type::iterator type; + typedef typename nth_index::type::iterator type; }; template struct nth_index_const_iterator { - typedef typename detail::prevent_eti< - nth_index, - typename nth_index::type - >::type::const_iterator type; + typedef typename nth_index::type::const_iterator type; }; template< @@ -1179,15 +1101,13 @@ typename nth_index_iterator< multi_index_container,N>::type project( multi_index_container& m, - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) + IteratorType it) { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; - typedef typename nth_index::type index; + typedef typename nth_index::type index_type; -#if (!defined(BOOST_MSVC)||!(BOOST_MSVC<1310))&& /* MSVC++ 6.0/7.0 fails */\ - (!defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580)) /* as does Sun C++ 5.7 */ +#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */ BOOST_STATIC_ASSERT(( mpl::contains< BOOST_DEDUCED_TYPENAME multi_index_type::iterator_type_list, @@ -1203,7 +1123,7 @@ project( BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m)); #endif - return detail::converter::iterator( + return detail::converter::iterator( m,static_cast(it.get_node())); } @@ -1214,15 +1134,13 @@ typename nth_index_const_iterator< multi_index_container,N>::type project( const multi_index_container& m, - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) + IteratorType it) { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; - typedef typename nth_index::type index; + typedef typename nth_index::type index_type; -#if (!defined(BOOST_MSVC)||!(BOOST_MSVC<1310))&& /* MSVC++ 6.0/7.0 fails */\ - (!defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580)) /* as does Sun C++ 5.7 */ +#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */ BOOST_STATIC_ASSERT(( mpl::contains< BOOST_DEDUCED_TYPENAME multi_index_type::iterator_type_list, @@ -1241,7 +1159,7 @@ project( BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m)); #endif - return detail::converter::const_iterator( + return detail::converter::const_iterator( m,static_cast(it.get_node())); } @@ -1268,16 +1186,14 @@ typename index_iterator< multi_index_container,Tag>::type project( multi_index_container& m, - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) + IteratorType it) { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; typedef typename ::boost::multi_index::index< - multi_index_type,Tag>::type index; + multi_index_type,Tag>::type index_type; -#if (!defined(BOOST_MSVC)||!(BOOST_MSVC<1310))&& /* MSVC++ 6.0/7.0 fails */\ - (!defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580)) /* as does Sun C++ 5.7 */ +#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */ BOOST_STATIC_ASSERT(( mpl::contains< BOOST_DEDUCED_TYPENAME multi_index_type::iterator_type_list, @@ -1293,7 +1209,7 @@ project( BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m)); #endif - return detail::converter::iterator( + return detail::converter::iterator( m,static_cast(it.get_node())); } @@ -1304,16 +1220,14 @@ typename index_const_iterator< multi_index_container,Tag>::type project( const multi_index_container& m, - IteratorType it - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) + IteratorType it) { typedef multi_index_container< Value,IndexSpecifierList,Allocator> multi_index_type; typedef typename ::boost::multi_index::index< - multi_index_type,Tag>::type index; + multi_index_type,Tag>::type index_type; -#if (!defined(BOOST_MSVC)||!(BOOST_MSVC<1310))&& /* MSVC++ 6.0/7.0 fails */\ - (!defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580)) /* as does Sun C++ 5.7 */ +#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */ BOOST_STATIC_ASSERT(( mpl::contains< BOOST_DEDUCED_TYPENAME multi_index_type::iterator_type_list, @@ -1332,7 +1246,7 @@ project( BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m)); #endif - return detail::converter::const_iterator( + return detail::converter::const_iterator( m,static_cast(it.get_node())); } @@ -1416,8 +1330,7 @@ void swap( } /* namespace multi_index */ -#if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION)&&\ - !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) +#if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION) /* class version = 1 : we now serialize the size through * boost::serialization::collection_size_type. * class version = 2 : proper use of {save|load}_construct_data. diff --git a/include/boost/multi_index_container_fwd.hpp b/include/boost/multi_index_container_fwd.hpp index 99e8db3..b35acad 100644 --- a/include/boost/multi_index_container_fwd.hpp +++ b/include/boost/multi_index_container_fwd.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2008 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -9,7 +9,7 @@ #ifndef BOOST_MULTI_INDEX_FWD_HPP #define BOOST_MULTI_INDEX_FWD_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif diff --git a/perf/test_perf.cpp b/perf/test_perf.cpp index a44acfa..7b24417 100644 --- a/perf/test_perf.cpp +++ b/perf/test_perf.cpp @@ -1,6 +1,6 @@ /* Boost.MultiIndex performance test. * - * Copyright 2003-2008 Joaquin M Lopez Munoz. + * Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -339,10 +339,7 @@ private: */ template -void run_tests( - const char* title - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(IndexedTest) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualTest)) +void run_tests(const char* title) { cout< -void compare_structures( - const char* title - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(IndexedType) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType)) +void compare_structures(const char* title) { run_tests< mono_container, @@ -386,11 +380,7 @@ void compare_structures( } template -void compare_structures2( - const char* title - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(IndexedType) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType1) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType2)) +void compare_structures2(const char* title) { run_tests< mono_container, @@ -402,12 +392,7 @@ template < typename IndexedType, typename ManualType1,typename ManualType2,typename ManualType3 > -void compare_structures3( - const char* title - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(IndexedType) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType1) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType2) - BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualType3)) +void compare_structures3(const char* title) { run_tests< mono_container, @@ -417,12 +402,14 @@ void compare_structures3( int main() { + /* some stdlibs provide the discussed but finally rejected std::identity */ + using boost::multi_index::identity; + { /* 1 ordered index */ typedef multi_index_container indexed_t; typedef set manual_t; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures( "1 ordered index"); @@ -437,7 +424,6 @@ int main() > > indexed_t; typedef list_wrapper > manual_t; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures( "1 sequenced index"); @@ -460,7 +446,6 @@ int main() manual_t1::key_compare > > manual_t2; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures2( "2 ordered indices"); @@ -485,7 +470,6 @@ int main() std::less > > manual_t2; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures2( "1 ordered index + 1 sequenced index"); @@ -518,7 +502,6 @@ int main() manual_t2::key_compare > > manual_t3; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures3( "3 ordered indices"); @@ -553,7 +536,6 @@ int main() manual_t2::key_compare > > manual_t3; - indexed_t dummy; /* MSVC++ 6.0 chokes if indexed_t is not instantiated */ compare_structures3( "2 ordered indices + 1 sequenced index"); diff --git a/test/test_comparison.cpp b/test/test_comparison.cpp index ce74e0d..1522619 100644 --- a/test/test_comparison.cpp +++ b/test/test_comparison.cpp @@ -13,6 +13,7 @@ #include /* keep it first to prevent nasty warns in MSVC */ #include "pre_multi_index.hpp" #include "employee.hpp" +#include "pair_of_ints.hpp" #include using namespace boost::multi_index; @@ -42,8 +43,10 @@ struct lookup_vector{ void test_comparison() { employee_set es; + employee_set_by_name& i1=get<1>(es); employee_set_by_age& i2=get<2>(es); employee_set_as_inserted& i3=get<3>(es); + employee_set_by_ssn& i4=get<4>(es); employee_set_randomly& i5=get<5>(es); es.insert(employee(0,"Joe",31,1123)); es.insert(employee(1,"Robert",27,5601)); @@ -52,8 +55,10 @@ void test_comparison() es.insert(employee(4,"John",57,1002)); employee_set es2; + employee_set_by_name& i12=get(es2); employee_set_by_age& i22=get(es2); employee_set_as_inserted& i32=get<3>(es2); + employee_set_by_ssn& i42=get<4>(es2); employee_set_randomly& i52=get<5>(es2); es2.insert(employee(0,"Joe",31,1123)); es2.insert(employee(1,"Robert",27,5601)); @@ -61,14 +66,43 @@ void test_comparison() es2.insert(employee(3,"Albert",20,9012)); BOOST_TEST(es==es&&es<=es&&es>=es&& - i22==i22&&i22<=i22&&i22>=i22&& - i32==i32&&i32<=i32&&i32>=i32&& - i52==i52&&i52<=i52&&i52>=i52); + i12==i12&& + i22==i22&&i22<=i22&&i22>=i22&& + i32==i32&&i32<=i32&&i32>=i32&& + i42==i42&& + i52==i52&&i52<=i52&&i52>=i52); BOOST_TEST(es!=es2&&es2es2&&!(es<=es2)&&!(es2>=es)); + BOOST_TEST(i1!=i12); BOOST_TEST(i2!=i22&&i22i22&&!(i2<=i22)&&!(i22>=i2)); BOOST_TEST(i3!=i32&&i32i32&&!(i3<=i32)&&!(i32>=i3)); + BOOST_TEST(i4!=i42); BOOST_TEST(i5!=i52&&i52i52&&!(i5<=i52)&&!(i52>=i5)); + multi_index_container< + pair_of_ints, + indexed_by< + hashed_non_unique + > + > hc1,hc2; + hc1.insert(pair_of_ints(0,0)); + hc1.insert(pair_of_ints(0,1)); + hc1.insert(pair_of_ints(0,2)); + hc1.insert(pair_of_ints(0,3)); + hc1.insert(pair_of_ints(1,0)); + hc1.insert(pair_of_ints(1,1)); + + hc2.insert(pair_of_ints(0,2)); + hc2.insert(pair_of_ints(0,1)); + hc2.insert(pair_of_ints(1,1)); + hc2.insert(pair_of_ints(1,0)); + hc2.insert(pair_of_ints(0,3)); + hc2.insert(pair_of_ints(0,0)); + BOOST_TEST(hc1==hc2); + + hc1.insert(pair_of_ints(0,4)); + hc2.insert(pair_of_ints(0,5)); + BOOST_TEST(hc1!=hc2); + lookup_list::type l1; lookup_list::type l2; lookup_vector::type l3; diff --git a/test/test_composite_key.cpp b/test/test_composite_key.cpp index a452ebb..d54b615 100644 --- a/test/test_composite_key.cpp +++ b/test/test_composite_key.cpp @@ -74,12 +74,9 @@ struct comparison_equal_length composite_key_result_equal_to eq; composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::equal_to std_eq; - std::less std_lt; - std::greater std_gt; -#endif + std::equal_to std_eq; + std::less std_lt; + std::greater std_gt; return (x< y) && !(y< x)&& !(x==y) && !(y==x)&& @@ -87,18 +84,12 @@ struct comparison_equal_length !(x> y) && (y> x)&& !(x>=y) && (y>=x)&& (x<=y) && !(y<=x)&& - !eq(x,y) && !eq(y,x)&& lt(x,y) && !lt(y,x)&& - !gt(x,y) && gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + !gt(x,y) && gt(y,x)&& !std_eq(x,y) && !std_eq(y,x)&& std_lt(x,y) && !std_lt(y,x)&& - !std_gt(x,y) && std_gt(y,x) -#endif - ; + !std_gt(x,y) && std_gt(y,x); } static bool is_greater(const CompositeKeyResult& x,const T2& y) @@ -106,12 +97,9 @@ struct comparison_equal_length composite_key_result_equal_to eq; composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::equal_to std_eq; - std::less std_lt; - std::greater std_gt; -#endif + std::equal_to std_eq; + std::less std_lt; + std::greater std_gt; return !(x< y) && (y< x)&& !(x==y) && !(y==x)&& @@ -119,18 +107,12 @@ struct comparison_equal_length (x> y) && !(y> x)&& (x>=y) && !(y>=x)&& !(x<=y) && (y<=x)&& - !eq(x,y) && !eq(y,x)&& !lt(x,y) && lt(y,x)&& - gt(x,y) && !gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + gt(x,y) && !gt(y,x)&& !std_eq(x,y) && !std_eq(y,x)&& !std_lt(x,y) && std_lt(y,x)&& - std_gt(x,y) && !std_gt(y,x) -#endif - ; + std_gt(x,y) && !std_gt(y,x); } static bool is_equiv(const CompositeKeyResult& x,const T2& y) @@ -138,12 +120,9 @@ struct comparison_equal_length composite_key_result_equal_to eq; composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::equal_to std_eq; - std::less std_lt; - std::greater std_gt; -#endif + std::equal_to std_eq; + std::less std_lt; + std::greater std_gt; return !(x< y) && !(y< x)&& (x==y) && (y==x)&& @@ -151,18 +130,12 @@ struct comparison_equal_length !(x> y) && !(y> x)&& (x>=y) && (y>=x)&& (x<=y) && (y<=x)&& - eq(x,y) && eq(y,x)&& !lt(x,y) && !lt(y,x)&& - !gt(x,y) && !gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + !gt(x,y) && !gt(y,x)&& std_eq(x,y) && std_eq(y,x)&& !std_lt(x,y) && !std_lt(y,x)&& - !std_gt(x,y) && !std_gt(y,x) -#endif - ; + !std_gt(x,y) && !std_gt(y,x); } }; @@ -173,78 +146,51 @@ struct comparison_different_length { composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::less std_lt; - std::greater std_gt; -#endif + std::less std_lt; + std::greater std_gt; return (x< y) && !(y< x)&& !(x> y) && (y> x)&& !(x>=y) && (y>=x)&& (x<=y) && !(y<=x)&& - lt(x,y) && !lt(y,x)&& - !gt(x,y) && gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + !gt(x,y) && gt(y,x)&& std_lt(x,y) && !std_lt(y,x)&& - !std_gt(x,y) && std_gt(y,x) -#endif - ; + !std_gt(x,y) && std_gt(y,x); } static bool is_greater(const CompositeKeyResult& x,const T2& y) { composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::less std_lt; - std::greater std_gt; -#endif + std::less std_lt; + std::greater std_gt; return !(x< y) && (y< x)&& (x> y) && !(y> x)&& (x>=y) && !(y>=x)&& !(x<=y) && (y<=x)&& - !lt(x,y) && lt(y,x)&& - gt(x,y) && !gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + gt(x,y) && !gt(y,x)&& !std_lt(x,y) && std_lt(y,x)&& - std_gt(x,y) && !std_gt(y,x) -#endif - ; + std_gt(x,y) && !std_gt(y,x); } static bool is_equiv(const CompositeKeyResult& x,const T2& y) { composite_key_result_less lt; composite_key_result_greater gt; - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - std::less std_lt; - std::greater std_gt; -#endif + std::less std_lt; + std::greater std_gt; return !(x< y) && !(y< x)&& !(x> y) && !(y> x)&& (x>=y) && (y>=x)&& (x<=y) && (y<=x)&& - !lt(x,y) && !lt(y,x)&& - !gt(x,y) && !gt(y,x) - -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - && + !gt(x,y) && !gt(y,x)&& !std_lt(x,y) && !std_lt(y,x)&& - !std_gt(x,y) && !std_gt(y,x) -#endif - ; + !std_gt(x,y) && !std_gt(y,x); } }; @@ -355,12 +301,7 @@ void test_composite_key() typedef multi_index_container< xyz, indexed_by< - ordered_unique< - ckey_t1 -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - ,composite_key_result_less -#endif - > + ordered_unique > > indexed_t1; @@ -576,13 +517,7 @@ void test_composite_key() typedef multi_index_container< xyz, indexed_by< - hashed_unique< - ckey_t1 -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) - ,composite_key_result_hash - ,composite_key_result_equal_to -#endif - > + hashed_unique > > indexed_t2; diff --git a/test/test_copy_assignment.cpp b/test/test_copy_assignment.cpp index 7a95f74..cea47c5 100644 --- a/test/test_copy_assignment.cpp +++ b/test/test_copy_assignment.cpp @@ -39,7 +39,7 @@ struct holder }; template -static void test_assign(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) +static void test_assign() { Sequence s; @@ -72,7 +72,7 @@ static void test_assign(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) #endif template -static void test_integral_assign(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) +static void test_integral_assign() { /* Special cases described in 23.1.1/9: integral types must not * be taken as iterators in assign(f,l) and insert(p,f,l). @@ -213,25 +213,17 @@ void test_copy_assignment() l.push_back(employee(1,"Rachel",27,9012)); l.push_back(employee(2,"Agatha",40,1520)); -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) - employee_set es13; - es13.insert(l.begin(),l.end()); -#else employee_set es13(l.begin(),l.end()); -#endif l.sort(); BOOST_TEST(es13.size()==l.size()&& std::equal(es13.begin(),es13.end(),l.begin())); - /* MSVC++ 6.0 chokes on test_assign without this explicit instantiation */ - multi_index_container > > s1; test_assign > > >(); test_integral_assign< multi_index_container > > >(); - multi_index_container > > s2; test_assign > > >(); test_integral_assign< multi_index_container > > >(); diff --git a/test/test_hash_ops.cpp b/test/test_hash_ops.cpp index 70e66f8..e85d905 100644 --- a/test/test_hash_ops.cpp +++ b/test/test_hash_ops.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -90,4 +91,28 @@ void test_hash_ops() hc.rehash(1); BOOST_TEST(hc.bucket_count()>=1); check_load_factor(hc); + + hash_container hc2; + hc2.insert(0); + hc2.max_load_factor(0.5f/hc2.bucket_count()); + BOOST_TEST(hc2.load_factor()>hc2.max_load_factor()); + hc2.reserve(1); + BOOST_TEST(hc2.load_factor()=1000); + std::vector v; + for(unsigned int n=0;nbc3); + bc3=hc3.bucket_count(); + hc3.reserve((hash_container::size_type)(3.0f*hc3.max_load_factor()*bc3)); + BOOST_TEST(hc3.bucket_count()>bc3); } diff --git a/test/test_key_extractors.cpp b/test/test_key_extractors.cpp index 75da43d..ec80a75 100644 --- a/test/test_key_extractors.cpp +++ b/test/test_key_extractors.cpp @@ -62,9 +62,6 @@ struct test_derived_class:test_class test_derived_class(int i,int j):test_class(i,j){} }; -BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(test_class) -BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(test_derived_class) - typedef identity idn; typedef identity cidn; typedef BOOST_MULTI_INDEX_MEMBER(test_class,int,int_member) key_m; @@ -134,9 +131,6 @@ struct test_nc_derived_class:test_nc_class test_nc_derived_class(int i,int j):test_nc_class(i,j){} }; -BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(test_nc_class) -BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(test_nc_derived_class) - typedef identity nc_idn; typedef identity nc_cidn; typedef BOOST_MULTI_INDEX_MEMBER(test_nc_class,int,int_member) nc_key_m; diff --git a/test/test_list_ops.cpp b/test/test_list_ops.cpp index 7c99346..e67fda7 100644 --- a/test/test_list_ops.cpp +++ b/test/test_list_ops.cpp @@ -73,7 +73,7 @@ bool is_sorted( #endif template -static void test_list_ops_unique_seq(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) +static void test_list_ops_unique_seq() { typedef typename nth_index::type sequenced_index; @@ -158,8 +158,7 @@ static void test_list_ops_unique_seq(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) } template -static void test_list_ops_non_unique_seq( - BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) +static void test_list_ops_non_unique_seq() { typedef typename Sequence::iterator iterator; @@ -199,37 +198,37 @@ static void test_list_ops_non_unique_seq( * http://lists.boost.org/boost-users/2006/09/22604.php */ { - Sequence ss,ss2; - ss.push_back(0); - ss2.push_back(0); - ss.splice(ss.end(),ss2,ss2.begin()); - CHECK_EQUAL(ss,(0)(0)); - BOOST_TEST(ss2.empty()); + Sequence ss_,ss2_; + ss_.push_back(0); + ss2_.push_back(0); + ss_.splice(ss_.end(),ss2_,ss2_.begin()); + CHECK_EQUAL(ss_,(0)(0)); + BOOST_TEST(ss2_.empty()); - ss.clear(); - ss2.clear(); - ss.push_back(0); - ss2.push_back(0); - ss.splice(ss.end(),ss2,ss2.begin(),ss2.end()); - CHECK_EQUAL(ss,(0)(0)); - BOOST_TEST(ss2.empty()); + ss_.clear(); + ss2_.clear(); + ss_.push_back(0); + ss2_.push_back(0); + ss_.splice(ss_.end(),ss2_,ss2_.begin(),ss2_.end()); + CHECK_EQUAL(ss_,(0)(0)); + BOOST_TEST(ss2_.empty()); - ss.clear(); - ss2.clear(); - ss.push_back(0); - ss2.push_back(0); - ss.merge(ss2); - CHECK_EQUAL(ss,(0)(0)); - BOOST_TEST(ss2.empty()); + ss_.clear(); + ss2_.clear(); + ss_.push_back(0); + ss2_.push_back(0); + ss_.merge(ss2_); + CHECK_EQUAL(ss_,(0)(0)); + BOOST_TEST(ss2_.empty()); typedef typename Sequence::value_type value_type; - ss.clear(); - ss2.clear(); - ss.push_back(0); - ss2.push_back(0); - ss.merge(ss2,std::less()); - CHECK_EQUAL(ss,(0)(0)); - BOOST_TEST(ss2.empty()); + ss_.clear(); + ss2_.clear(); + ss_.push_back(0); + ss2_.push_back(0); + ss_.merge(ss2_,std::less()); + CHECK_EQUAL(ss_,(0)(0)); + BOOST_TEST(ss2_.empty()); } } @@ -247,10 +246,6 @@ void test_list_ops() > > sequenced_set; - /* MSVC++ 6.0 chokes on test_list_ops_unique_seq without this - * explicit instantiation - */ - sequenced_set ss; test_list_ops_unique_seq(); @@ -262,7 +257,6 @@ void test_list_ops() > > random_access_set; - random_access_set rs; test_list_ops_unique_seq(); typedef multi_index_container< @@ -270,7 +264,6 @@ void test_list_ops() indexed_by > > int_list; - int_list il; test_list_ops_non_unique_seq(); typedef multi_index_container< @@ -278,6 +271,5 @@ void test_list_ops() indexed_by > > int_vector; - int_vector iv; test_list_ops_non_unique_seq(); } diff --git a/test/test_rearrange.cpp b/test/test_rearrange.cpp index ae082c3..9a5ddae 100644 --- a/test/test_rearrange.cpp +++ b/test/test_rearrange.cpp @@ -47,7 +47,7 @@ using namespace boost::multi_index; #endif template -static void local_test_rearrange(BOOST_EXPLICIT_TEMPLATE_TYPE(Sequence)) +static void local_test_rearrange() { typedef typename Sequence::iterator iterator; typedef typename Sequence::value_type value_type; @@ -121,10 +121,6 @@ void test_rearrange() indexed_by > > int_list; - /* MSVC++ 6.0 chokes on local_test_rearrange without this - * explicit instantiation - */ - int_list il; local_test_rearrange(); typedef multi_index_container< @@ -132,6 +128,5 @@ void test_rearrange() indexed_by > > int_vector; - int_vector iv; local_test_rearrange(); } diff --git a/test/test_safe_mode.cpp b/test/test_safe_mode.cpp index 92ad09a..56fee8f 100644 --- a/test/test_safe_mode.cpp +++ b/test/test_safe_mode.cpp @@ -266,15 +266,14 @@ static void local_test_safe_mode( } template -static void local_test_safe_mode(BOOST_EXPLICIT_TEMPLATE_TYPE(Policy)) +static void local_test_safe_mode() { typedef typename Policy::index_type::iterator::iterator_category category; ::local_test_safe_mode(category()); } template -static void local_test_safe_mode_with_rearrange( - BOOST_EXPLICIT_TEMPLATE_TYPE(Policy)) +static void local_test_safe_mode_with_rearrange() { ::local_test_safe_mode(); @@ -329,11 +328,8 @@ static void local_test_safe_mode_with_rearrange( template struct index_policy_base { - typedef MultiIndexContainer container; - typedef typename - boost::multi_index::detail::prevent_eti< - container, - typename nth_index::type>::type index_type; + typedef MultiIndexContainer container; + typedef typename nth_index::type index_type; static index_type& index_from_container(container& c){return get(c);} }; @@ -409,7 +405,7 @@ struct employee_set_randomly_policy: {}; template -static void test_integral_bimap(BOOST_EXPLICIT_TEMPLATE_TYPE(IntegralBimap)) +static void test_integral_bimap() { typedef typename IntegralBimap::value_type value_type; typedef typename IntegralBimap::iterator iterator; @@ -447,10 +443,6 @@ void test_safe_mode() ordered_unique > > bimap0_type; - /* MSVC++ 6.0 chokes on test_integral_bimap without this - * explicit instantiation - */ - bimap0_type bm0; test_integral_bimap(); typedef multi_index_container< @@ -460,7 +452,6 @@ void test_safe_mode() hashed_unique > > bimap1_type; - bimap1_type bm1; test_integral_bimap(); typedef multi_index_container< @@ -470,7 +461,6 @@ void test_safe_mode() ordered_unique > > bimap2_type; - bimap2_type bm2; test_integral_bimap(); typedef multi_index_container< @@ -480,6 +470,5 @@ void test_safe_mode() hashed_unique > > bimap3_type; - bimap3_type bm3; test_integral_bimap(); } diff --git a/test/test_serialization3.cpp b/test/test_serialization3.cpp index 823254c..6e3c730 100644 --- a/test/test_serialization3.cpp +++ b/test/test_serialization3.cpp @@ -35,9 +35,7 @@ template void save_construct_data( Archive& ar,const non_default_ctble* p,const unsigned int version) { -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if(version<3)return; -#endif ar<n); } @@ -46,9 +44,7 @@ template void load_construct_data( Archive& ar,non_default_ctble* p,const unsigned int version) { -#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if(version<3)return; -#endif int n=0; ar>>boost::serialization::make_nvp("n",n); @@ -145,10 +141,10 @@ void test_serialization3() for(std::size_t buc=0;buc>n; - ia>>it; - BOOST_TEST(*it==n); + ia>>it_; + BOOST_TEST(*it_==n); } local_iterator it2; ia>>it2; diff --git a/test/test_update.cpp b/test/test_update.cpp index 578979f..08a8156 100644 --- a/test/test_update.cpp +++ b/test/test_update.cpp @@ -31,17 +31,33 @@ struct null_hash std::size_t operator()(const T&)const{return 0;} }; +struct assign_value +{ + assign_value(int n):n_(n){} + + void operator()(int& x)const{x=n_;} + + int n_; +}; + template -void test_stable_update(BOOST_EXPLICIT_TEMPLATE_TYPE(MultiIndexContainer)) +void test_stable_update() { typedef typename MultiIndexContainer::iterator iterator; typedef typename MultiIndexContainer::size_type size_type; MultiIndexContainer c; - c.insert(0);c.insert(0);c.insert(0);c.insert(0); - c.insert(1);c.insert(1);c.insert(1); - c.insert(2);c.insert(2); + c.insert(0); + c.insert(1);c.insert(1); + c.insert(2);c.insert(2);c.insert(2);c.insert(2); c.insert(3); + c.insert(4);c.insert(4);c.insert(4); + c.insert(5);c.insert(5); + c.insert(6); + c.insert(7); + size_type num_elems= + c.count(0)+c.count(1)+c.count(2)+c.count(3)+ + c.count(4)+c.count(5)+c.count(6)+c.count(7); for(size_type n=c.size();n--;){ iterator it=boost::next(c.begin(),n); @@ -54,6 +70,18 @@ void test_stable_update(BOOST_EXPLICIT_TEMPLATE_TYPE(MultiIndexContainer)) c.modify(it,do_nothing(),do_nothing()); BOOST_TEST((size_type)std::distance(c.begin(),it)==n); + + for(int i=0;i<=8;++i){ + MultiIndexContainer cpy(c); + bool b=c.modify(it,assign_value(i),assign_value(*it)); + BOOST_TEST(b||(size_type)std::distance(c.begin(),it)==n); + BOOST_TEST(c.count(0)+c.count(1)+c.count(2)+c.count(3)+c.count(4)+ + c.count(5)+c.count(6)+c.count(7)+c.count(8)==num_elems); + if(b){ + c=cpy; + it=boost::next(c.begin(),n); + } + } } } @@ -148,16 +176,16 @@ void test_update() BOOST_TEST(!iis.modify_key(iis.begin(),increment_int)); BOOST_TEST(iis.size()==2); - nth_index_iterator::type it=ii1.find(5); - BOOST_TEST(ii1.modify_key(it,increment_int)); - BOOST_TEST(ii1.modify_key(it,increment_int)); - BOOST_TEST(ii1.modify_key(it,increment_int,decrement_int)); - BOOST_TEST(ii1.modify_key(it,increment_int)); + nth_index_iterator::type it_=ii1.find(5); + BOOST_TEST(ii1.modify_key(it_,increment_int)); + BOOST_TEST(ii1.modify_key(it_,increment_int)); + BOOST_TEST(ii1.modify_key(it_,increment_int,decrement_int)); + BOOST_TEST(ii1.modify_key(it_,increment_int)); - BOOST_TEST(!ii1.modify_key(it,increment_int,decrement_int)); + BOOST_TEST(!ii1.modify_key(it_,increment_int,decrement_int)); BOOST_TEST(ii1.size()==2); - BOOST_TEST(!ii1.modify_key(it,increment_int)); + BOOST_TEST(!ii1.modify_key(it_,increment_int)); BOOST_TEST(ii1.size()==1); } { @@ -214,11 +242,8 @@ void test_update() indexed_by< ordered_non_unique > > - > int_set; - - /* MSVC++ 6.0 needs this out-of-template definition */ - int_set dummy1; - test_stable_update(); + > int_multiset; + test_stable_update(); typedef multi_index_container< int, @@ -226,8 +251,6 @@ void test_update() hashed_unique > > > int_hashed_set; - - int_hashed_set dummy2; test_stable_update(); typedef multi_index_container< @@ -236,8 +259,6 @@ void test_update() hashed_unique > > > int_hashed_multiset; - - int_hashed_multiset dummy3; test_stable_update(); typedef multi_index_container< @@ -246,8 +267,6 @@ void test_update() hashed_unique,null_hash> > > degenerate_int_hashed_set; - - degenerate_int_hashed_set dummy4; test_stable_update(); typedef multi_index_container< @@ -256,8 +275,6 @@ void test_update() hashed_non_unique,null_hash> > > degenerate_int_hashed_multiset; - - degenerate_int_hashed_multiset dummy5; test_stable_update(); } }