Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r49674 - in trunk: boost/multi_index libs/multi_index/doc libs/multi_index/doc/reference libs/multi_index/doc/tutorial libs/multi_index/example
From: joaquin_at_[hidden]
Date: 2008-11-10 09:49:58

Author: joaquin
Date: 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
New Revision: 49674
URL: http://svn.boost.org/trac/boost/changeset/49674

Log:
suppressed MSVC warning in composite_key, deprecated nth_index_iterator and family, some stylistic changes in the tutorial.
Text files modified:
   trunk/boost/multi_index/composite_key.hpp | 9 +++
   trunk/libs/multi_index/doc/reference/multi_index_container.html | 117 +++++++++++++++++++++++----------------
   trunk/libs/multi_index/doc/release_notes.html | 39 +++++++++++-
   trunk/libs/multi_index/doc/tutorial/basics.html | 29 +--------
   trunk/libs/multi_index/doc/tutorial/techniques.html | 6 +-
   trunk/libs/multi_index/example/bimap.cpp | 4
   trunk/libs/multi_index/example/complex_structs.cpp | 4
   trunk/libs/multi_index/example/fun_key.cpp | 2
   8 files changed, 125 insertions(+), 85 deletions(-)

Modified: trunk/boost/multi_index/composite_key.hpp
==============================================================================
--- trunk/boost/multi_index/composite_key.hpp (original)
+++ trunk/boost/multi_index/composite_key.hpp 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -563,6 +563,11 @@

/* composite_key_result */

+#if defined(BOOST_MSVC)
+#pragma warning(push)
+#pragma warning(disable:4512)
+#endif
+
template<typename CompositeKey>
struct composite_key_result
{
@@ -578,6 +583,10 @@
const value_type& value;
};

+#if defined(BOOST_MSVC)
+#pragma warning(pop)
+#endif
+
/* composite_key */

/* NB. Some overloads of operator() have an extra dummy parameter int=0.

Modified: trunk/libs/multi_index/doc/reference/multi_index_container.html
==============================================================================
--- trunk/libs/multi_index/doc/reference/multi_index_container.html (original)
+++ trunk/libs/multi_index/doc/reference/multi_index_container.html 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -99,10 +99,15 @@

template<typename MultiIndexContainer,int N> struct nth_index;
template<typename MultiIndexContainer,typename Tag> struct index;
-template<typename MultiIndexContainer,int N> struct nth_index_iterator;
-template<typename MultiIndexContainer,int N> struct nth_index_const_iterator;
-template<typename MultiIndexContainer,typename Tag> struct index_iterator;
-template<typename MultiIndexContainer,typename Tag> struct index_const_iterator;
+
+template<typename MultiIndexContainer,int N>
+struct nth_index_iterator; // deprecated
+template<typename MultiIndexContainer,int N>
+struct nth_index_const_iterator; // deprecated
+template<typename MultiIndexContainer,typename Tag>
+struct index_iterator; // deprecated
+template<typename MultiIndexContainer,typename Tag>
+struct index_const_iterator; // deprecated

// multi_index_container global functions for index retrieval:

@@ -144,9 +149,9 @@
 int N,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename nth_index_iterator<
+typename nth_index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,N
->::type
+>::type::iterator
project(
 multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it);
@@ -155,9 +160,9 @@
 int N,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename nth_index_const_iterator<
+typename nth_index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,N
->::type
+>::type::const_iterator
project(
 const multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it);
@@ -166,9 +171,9 @@
 typename Tag,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename index_iterator<
+typename index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,Tag
->::type
+>::type::iterator
project(
 multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it);
@@ -177,9 +182,9 @@
 typename Tag,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename index_const_iterator<
+typename index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,Tag
->::type
+>::type::const_iterator
project(
 const multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it);
@@ -265,14 +270,20 @@
 template<typename Tag>
 struct index {typedef implementation defined type;};
 template<int N>
- struct nth_index_iterator {typedef implementation defined type;};
+
+ template<int N>
+ struct nth_index_iterator // deprecated
+ {typedef implementation defined type;};
 template<int N>
- struct nth_index_const_iterator {typedef implementation defined type;};
+ struct nth_index_const_iterator // deprecated
+ {typedef implementation defined type;};
 template<typename Tag>
- struct index_iterator {typedef implementation defined type;};
+ struct index_iterator // deprecated
+ {typedef implementation defined type;};
 template<typename Tag>
- struct index_const_iterator {typedef implementation defined type;};
-
+ struct index_const_iterator // deprecated
+ {typedef implementation defined type;};
+
 // construct/copy/destroy:

 explicit multi_index_container(
@@ -304,13 +315,13 @@
 // projection of iterators

 template<int N,typename IteratorType>
- typename nth_index_iterator<N>::type project(IteratorType it);
+ typename nth_index<N>::type::iterator project(IteratorType it);
 template<int N,typename IteratorType>
- typename nth_index_const_iterator<N>::type project(IteratorType it)const;
+ typename nth_index<N>::type::const_iterator project(IteratorType it)const;
 template<typename Tag,typename IteratorType>
- typename index_iterator<Tag>::type project(IteratorType it);
+ typename index<Tag>::type::iterator project(IteratorType it);
 template<typename Tag,typename IteratorType>
- typename index_const_iterator<Tag>::type project(IteratorType it)const;
+ typename index<Tag>::type::const_iterator project(IteratorType it)const;
};

// multi_index_container associated global class templates:
@@ -325,22 +336,26 @@
 typedef typename MultiIndexContainer::index<Tag>::type type;
};

-template<typename MultiIndexContainer,int N> struct nth_index_iterator
+template<typename MultiIndexContainer,int N>
+struct nth_index_iterator // deprecated
{
 typedef typename MultiIndexContainer::nth_index_iterator<N>::type type;
};

-template<typename MultiIndexContainer,int N> struct nth_index_const_iterator
+template<typename MultiIndexContainer,int N>
+struct nth_index_const_iterator // deprecated
{
 typedef typename MultiIndexContainer::nth_index_const_iterator<N>::type type;
};

-template<typename MultiIndexContainer,typename Tag> struct index_iterator
+template<typename MultiIndexContainer,typename Tag>
+struct index_iterator // deprecated
{
 typedef typename MultiIndexContainer::index_iterator<Tag>::type type;
};

-template<typename MultiIndexContainer,typename Tag> struct index_const_iterator
+template<typename MultiIndexContainer,typename Tag>
+struct index_const_iterator // deprecated
{
 typedef typename MultiIndexContainer::index_const_iterator<Tag>::type type;
};
@@ -397,56 +412,56 @@
 int N,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename nth_index_iterator<
+typename nth_index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,N
->::type
+>::type::iterator
project(
 multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it)
{
- return m.project<N>(it);
+ return m.template project<N>(it);
}

template<
 int N,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename nth_index_const_iterator<
+typename nth_index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,N
->::type
+>::type::const_iterator
project(
 const multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it)
{
- return m.project<N>(it);
+ return m.template project<N>(it);
}

template<
 typename Tag,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename index_iterator<
+typename index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,Tag
->::type
+>::type::iterator
project(
 multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it)
{
- return m.project<Tag>(it);
+ return m.template project<Tag>(it);
}

template<
 typename Tag,typename IteratorType,
 typename Value,typename IndexSpecifierList,typename Allocator
>
-typename index_const_iterator<
+typename index<
 multi_index_container<Value,IndexSpecifierList,Allocator>,Tag
->::type
+>::type::const_iterator
project(
 const multi_index_container<Value,IndexSpecifierList,Allocator>& m,
 IteratorType it)
{
- return m.project<Tag>(it);
+ return m.template project<Tag>(it);
}

// comparison:
@@ -620,6 +635,7 @@
<blockquote>
<code>nth_index_iterator<N>::type</code> is equivalent to
<code>nth_index<N>::type::iterator</code>. 
+Note: The use of <code>nth_index_iterator</code> is deprecated.
</blockquote>

<code>template<int N> struct nth_index_const_iterator</code>
@@ -627,6 +643,7 @@
<blockquote>
<code>nth_index_const_iterator<N>::type</code> is equivalent to
<code>nth_index<N>::type::const_iterator</code>. 
+Note: The use of <code>nth_index_const_iterator</code> is deprecated.
</blockquote>

<code>template<typename Tag> struct index_iterator</code>
@@ -634,6 +651,7 @@
<blockquote>
<code>index_iterator<Tag>::type</code> is equivalent to
<code>index<Tag>::type::iterator</code>. 
+Note: The use of <code>index_iterator</code> is deprecated.
</blockquote>

<code>template<typename Tag> struct index_const_iterator</code>
@@ -641,6 +659,7 @@
<blockquote>
<code>index_const_iterator<Tag>::type</code> is equivalent to
<code>index<Tag>::type::const_iterator</code>. 
+Note: The use of <code>index_const_iterator</code> is deprecated.
</blockquote>

<h4><a name="constructors">Constructors, copy and assignment</a></h4>
@@ -787,21 +806,21 @@


<code>template<int N,typename IteratorType> 
-typename nth_index_iterator<N>::type project(IteratorType it);</code>
+typename nth_index<N>::type::iterator project(IteratorType it);</code>

<blockquote>
Requires: <code>0 <= N < I</code>. <code>IteratorType</code>
belongs to <code>iterator_type_list</code>. <code>it</code> is a valid
iterator of some index of <code>*this</code> (i.e. does not refer to some
other <code>multi_index_container</code>.) 
-Effects: Returns an <code>nth_index_iterator<N>::type</code> iterator
+Effects: Returns an <code>nth_index<N>::type::iterator</code>
equivalent to <code>it</code>. 
Complexity: Constant. 
Exception safety: <code>nothrow</code>.
</blockquote>

<code>template<int N,typename IteratorType> 
-typename nth_index_const_iterator<N>::type project(IteratorType it)const;</code>
+typename nth_index<N>::type::const_iterator project(IteratorType it)const;</code>

<blockquote>
Requires: <code>0 <= N < I</code>. <code>IteratorType</code>
@@ -809,38 +828,38 @@
<code>iterator_type_list</code>. <code>it</code> is a
valid (constant or non-constant) iterator of some index of <code>*this</code>
(i.e. does not refer to some other <code>multi_index_container</code>.) 
-Effects: Returns an <code>nth_index_const_iterator<N>::type</code>
-iterator equivalent to <code>it</code>. 
+Effects: Returns an <code>nth_index<N>::type::const_iterator</code>
+equivalent to <code>it</code>. 
Complexity: Constant. 
Exception safety: <code>nothrow</code>.
</blockquote>

<code>template<typename Tag,typename IteratorType> 
-typename index_iterator<Tag>::type project(IteratorType it);</code>
+typename index<Tag>::type::iterator project(IteratorType it);</code>

<blockquote>
Requires: <code>Tag</code> is such that
-<code>index_iterator<Tag>::type</code> is valid. <code>IteratorType</code>
+<code>index<Tag>::type</code> is valid. <code>IteratorType</code>
belongs to <code>iterator_type_list</code>. <code>it</code> is a valid
iterator of some index of <code>*this</code> (i.e. does not refer to some
other <code>multi_index_container</code>.) 
-Effects: Returns an <code>index_iterator<Tag>::type</code> iterator
+Effects: Returns an <code>index<Tag>::type::iterator</code>
equivalent to <code>it</code>. 
Complexity: Constant. 
Exception safety: <code>nothrow</code>.
</blockquote>

<code>template<typename Tag,typename IteratorType> 
-typename index_const_iterator<Tag>::type project(IteratorType it)const;</code>
+typename index<Tag>::type::const_iterator project(IteratorType it)const;</code>

<blockquote>
Requires: <code>Tag</code> is such that
-<code>index_const_iterator<Tag>::type</code> is valid. <code>IteratorType</code>
+<code>index<Tag>::type</code> is valid. <code>IteratorType</code>
belongs to <code>const_iterator_type_list</code> or
<code>iterator_type_list</code>. <code>it</code> is a valid
(constant or non-constant) iterator of some index of <code>*this</code>
(i.e. does not refer to some other <code>multi_index_container</code>.) 
-Effects: Returns an <code>index_const_iterator<Tag>::type</code>
+Effects: Returns an <code>index<Tag>::type::const_iterator</code>
iterator equivalent to <code>it</code>. 
Complexity: Constant. 
Exception safety: <code>nothrow</code>.
@@ -911,7 +930,7 @@

 

-Revised June 25th 2008
+Revised November 6th 2008

© Copyright 2003-2008 Joaquín M López Muñoz.
Distributed under the Boost Software

Modified: trunk/libs/multi_index/doc/release_notes.html
==============================================================================
--- trunk/libs/multi_index/doc/release_notes.html (original)
+++ trunk/libs/multi_index/doc/release_notes.html 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -31,6 +31,7 @@
<h2>Contents</h2>

<ul>
+ <li>Boost 1.38 release</li>
 <li>Boost 1.37 release</li>
 <li>Boost 1.36 release</li>
 <li>Boost 1.35 release</li>
@@ -39,6 +40,37 @@
 <li>Boost 1.33 release</li>
</ul>

+<h2><a name="boost_1_38">Boost 1.38 release</a></h2>
+
+
+<ul>
+ <li>These constructs are deprecated:
+ <ul>
+ <li><code>nth_index_iterator<MultiIndexContainer,N>::type</code>,</li>
+ <li><code>multi_index_container<...>::nth_index_iterator<N>::type</code>,</li>
+ <li><code>nth_index_const_iterator<MultiIndexContainer,N>::type</code>,</li>
+ <li><code>multi_index_container<...>::nth_index_const_iterator<N>::type</code>,</li>
+ <li><code>index_iterator<MultiIndexContainer,Tag>::type</code>,</li>
+ <li><code>multi_index_container<...>::index_iterator<Tag>::type</code>,</li>
+ <li><code>index_const_iterator<MultiIndexContainer,Tag>::type</code>,</li>
+ <li><code>multi_index_container<...>::index_const_iterator<Tag>::type</code>.</li>
+ </ul>
+ Use the following instead:
+ <ul>
+ <li><code>nth_index<MultiIndexContainer,N>::type::iterator</code>,</li>
+ <li><code>multi_index_container<...>::nth_index<N>::type::iterator</code>,</li>
+ <li><code>nth_index<MultiIndexContainer,N>::type::const_iterator</code>,</li>
+ <li><code>multi_index_container<...>::nth_index<N>::type::const_iterator</code>,</li>
+ <li><code>index<MultiIndexContainer,Tag>::type::iterator</code>,</li>
+ <li><code>multi_index_container<...>::index<Tag>::type::iterator</code>,</li>
+ <li><code>index<MultiIndexContainer,Tag>::type::const_iterator</code>,</li>
+ <li><code>multi_index_container<...>::index<Tag>::type::const_iterator</code>.</li>
+ </ul>
+ </li>
+ <li>Maintenance fixes.</li>
+</ul>
+
+
<h2><a name="boost_1_37">Boost 1.37 release</a></h2>


@@ -51,13 +83,12 @@


<ul>
- <a name="stable_update">
- <li>On prior versions of the library, the <a href="tutorial/indices.html#hash_updating">update
+ <li><a name="stable_update">On prior versions of the library, the <a href="tutorial/indices.html#hash_updating">update
 member functions</a> of hashed indices could alter the position of an element even if the
 associated key did not change with the update. This is legal but probably unexpected behavior.
 The functions have been rewritten to provide the additional guarantee that elements with
 unmodified key will not change position in hashed indices, just as always was the case with
- ordered indices. These guarantees are now documented in the reference.</li>
+ ordered indices. These guarantees are now documented in the reference.</a></li>
 <li>Added the constructor <code>multi_index_container::multi_index_container(const allocator_type&)</code>
 to mimic the equivalent interface in STL sequence containers.
 <li>Maintenance fixes.</li>
@@ -232,7 +263,7 @@

 

-Revised August 29th 2008
+Revised November 10th 2008

© Copyright 2003-2008 Joaquín M López Muñoz.
Distributed under the Boost Software

Modified: trunk/libs/multi_index/doc/tutorial/basics.html
==============================================================================
--- trunk/libs/multi_index/doc/tutorial/basics.html (original)
+++ trunk/libs/multi_index/doc/tutorial/basics.html 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -153,7 +153,8 @@


Instead of a single comparison predicate type, as it happens for STL associative
-containers, <code>multi_index_container</code> is passed a typelist of index
+containers, <code>multi_index_container</code> is passed a
+list of index
specifications (<code>indexed_by</code>), each one inducing the corresponding index.
Indices are accessed via
<a href="../reference/multi_index_container.html#index_retrieval"><code>get</code></a><code><N>()</code>
@@ -473,26 +474,6 @@
 es.get<1>().find("Judy Smith");
</pre></blockquote>

-
-Additionally, <code>multi_index_container</code>s provide shortcut
-definitions to the iterator types of their constituent indices:
-
-
-<blockquote><pre>
-employee_set::nth_index_iterator<1>::type it=
- es.get<1>().find("Judy Smith");
-</pre></blockquote>
-
-
-There is a variation of the expression above for use with
-tags:
-
-
-<blockquote><pre>
-employee_set::index_iterator<name>::type it=
- es.get<name>().find("Judy Smith"); // get<1> would also work
-</pre></blockquote>
-
<h2>
<a name="index_types">Index types</a>
</h2>
@@ -1208,7 +1189,7 @@

// prepend "older" to all occurrences of "sister"

-text_container::nth_index_iterator<1>::type it1=
+text_container::nth_index<1>::type::iterator it1=
 sorted_index.lower_bound("sister");

while(it1!=sorted_index.end()&&*it1=="sister"){
@@ -1259,9 +1240,9 @@

 

-Revised July 17th 2007
+Revised November 7th 2008

-© Copyright 2003-2007 Joaquín M López Muñoz.
+© Copyright 2003-2008 Joaquín M López Muñoz.
Distributed under the Boost Software
License, Version 1.0. (See accompanying file <a href="../../../../LICENSE_1_0.txt">
LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">

Modified: trunk/libs/multi_index/doc/tutorial/techniques.html
==============================================================================
--- trunk/libs/multi_index/doc/tutorial/techniques.html (original)
+++ trunk/libs/multi_index/doc/tutorial/techniques.html 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -285,7 +285,7 @@
Each of these types is an MPL sequence with as many elements as indices
comprise the <code>multi_index_container</code>: for instance, the <code>n</code>-th
element of <code>iterator_type_list</code> is the same as
-<code>nth_index_iterator<n>::type</code>.
+<code>nth_index<n>::type::iterator</code>.



@@ -392,9 +392,9 @@

 

-Revised February 6th 2006
+Revised November 7th 2008

-© Copyright 2003-2006 Joaquín M López Muñoz.
+© Copyright 2003-2008 Joaquín M López Muñoz.
Distributed under the Boost Software
License, Version 1.0. (See accompanying file <a href="../../../../LICENSE_1_0.txt">
LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">

Modified: trunk/libs/multi_index/example/bimap.cpp
==============================================================================
--- trunk/libs/multi_index/example/bimap.cpp (original)
+++ trunk/libs/multi_index/example/bimap.cpp 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -108,7 +108,7 @@
 std::cout<<word<<" is said "<<it->second<<" in English"<<std::endl;
 }
 else{
- nth_index_iterator<dictionary,1>::type it2=get<1>(d).find(word);
+ nth_index<dictionary,1>::type::iterator it2=get<1>(d).find(word);
 if(it2!=get<1>(d).end()){
 std::cout<<word<<" is said "<<it2->first<<" in Spanish"<<std::endl;
 }
@@ -129,7 +129,7 @@
 else{
 /* word not found in Spanish, try our luck in English */

- dictionary::index_iterator<to>::type it2=d.get<to>().find(word);
+ dictionary::index<to>::type::iterator it2=d.get<to>().find(word);
 if(it2!=d.get<to>().end()){
 std::cout<<word<<" is said "<<it2->first<<" in Spanish"<<std::endl;
 }

Modified: trunk/libs/multi_index/example/complex_structs.cpp
==============================================================================
--- trunk/libs/multi_index/example/complex_structs.cpp (original)
+++ trunk/libs/multi_index/example/complex_structs.cpp 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -245,7 +245,7 @@

 /* find all the cars for the manufacturer given */

- index_iterator<car_table,manufacturer>::type ic0,ic1;
+ boost::multi_index::index<car_table,manufacturer>::type::iterator ic0,ic1;
 boost::tuples::tie(ic0,ic1)=get<manufacturer>(ct).equal_range(cm);

 /* construct a view (indexed by price) with these */
@@ -280,7 +280,7 @@

 /* find the cars in the range given */

- index_iterator<car_table,price>::type ic0,ic1;
+ boost::multi_index::index<car_table,price>::type::iterator ic0,ic1;
 ic0=get<price>(ct).lower_bound(min_price);
 ic1=get<price>(ct).upper_bound(max_price);

Modified: trunk/libs/multi_index/example/fun_key.cpp
==============================================================================
--- trunk/libs/multi_index/example/fun_key.cpp (original)
+++ trunk/libs/multi_index/example/fun_key.cpp 2008-11-10 09:49:57 EST (Mon, 10 Nov 2008)
@@ -91,7 +91,7 @@

 std::cout<<"\nLength order\n"
 << "------------"<<std::endl;
- for(nth_index_iterator<name_record_set,1>::type it1=get<1>(ns).begin();
+ for(nth_index<name_record_set,1>::type::iterator it1=get<1>(ns).begin();
 it1!=get<1>(ns).end();++it1){
 std::cout<<it1->name()<<std::endl;
 }

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk