diff --git a/doc/html/fusion/acknowledgements.html b/doc/html/fusion/acknowledgements.html index 05453358..d1f544ad 100644 --- a/doc/html/fusion/acknowledgements.html +++ b/doc/html/fusion/acknowledgements.html @@ -1,16 +1,12 @@ - + Acknowledgements -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - - - + + + @@ -26,13 +22,10 @@
PrevUpHomeNext
-
-
-

-Acknowledgements -

-
-
+
+

+Acknowledgements +

Special thanks to David Abrahams, Douglas Gregor, Hartmut Kaiser, Aleksey Gurtovoy, Peder Holt, Daniel Wallin, Jaakko Jarvi, Jeremiah Willcock, Dan Marsden, Eric @@ -50,7 +43,7 @@

-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted.html b/doc/html/fusion/adapted.html index 080ac71c..beb3e6aa 100644 --- a/doc/html/fusion/adapted.html +++ b/doc/html/fusion/adapted.html @@ -1,16 +1,12 @@ - + Adapted -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - - - + + + @@ -26,13 +22,10 @@

PrevUpHomeNext
-
-
- -
-
+
+
std::pair
mpl sequence
@@ -42,10 +35,10 @@
BOOST_FUSION_ADAPT_ASSOC_STRUCT

- Fusion provides a couple of adapters for other sequences such as std::pair, + Fusion provides a couple of adapters for other sequences such as std::pair, MPL sequences, - and boost::array. These adapters are written using Fusion's - non-intrusive Extension mechanism. + and boost::array. These adapters are written using Fusion's + non-intrusive Extension mechanism. If you wish to use these sequences with fusion, simply include the necessary files and they will be regarded as first-class, fully conforming fusion sequences.

@@ -53,23 +46,16 @@ Fusion also provides various schemes to make it easy for the user to adapt various data structures, non-intrusively, as full fledged Fusion sequences.

-<<<<<<< .working -

- - Header -

-=======

- + Header

->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted.hpp>
 #include <boost/fusion/include/adapted.hpp>

Fusion sequences may also be adapted as fully conforming MPL - sequences (see Intrinsics). + sequences (see Intrinsics). That way, we can have 2-way adaptation to and from MPL and Fusion. To make Fusion sequences fully conforming MPL sequences, include: @@ -88,7 +74,7 @@

-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/adapt_assoc.html b/doc/html/fusion/adapted/adapt_assoc.html index a52d02b3..eb3a76d6 100644 --- a/doc/html/fusion/adapted/adapt_assoc.html +++ b/doc/html/fusion/adapted/adapt_assoc.html @@ -1,16 +1,12 @@ - - BOOST_FUSION_ADAPT_ASSOC_STRUCT + +BOOST_FUSION_ADAPT_ASSOC_STRUCT -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,47 +22,24 @@

PrevUpHomeNext
-<<<<<<< .working -
-
- -
-
-

- - Description -

-=======
- + Description
->>>>>>> .merge-right.r57125

BOOST_FUSION_ADAPT_ASSOC_STRUCT is a macro that can be used to generate all - the necessary boilerplate to make an arbitrary struct into a model of Random Access Sequence - and Associative + the necessary boilerplate to make an arbitrary struct into a model of Random Access Sequence + and Associative Sequence.

-<<<<<<< .working -

- - Synopsis -

-=======
- + Synopsis
->>>>>>> .merge-right.r57125 
BOOST_FUSION_ADAPT_ASSOC_STRUCT(
     struct_name,
     (member_type0, member_name0, key_type0)
@@ -74,58 +47,35 @@
     ...
     )
-<<<<<<< .working -

- - Semantics -

-=======
- + Semantics
->>>>>>> .merge-right.r57125

- The above macro generates the necessary code to adapt struct_name - as a model of Random - Access Sequence and Associative - Sequence. The sequence of (member_typeN, + The above macro generates the necessary code to adapt struct_name + as a model of Random + Access Sequence and Associative + Sequence. The sequence of (member_typeN, member_nameN, - key_typeN) + key_typeN) triples declare the type, name and key type of each of the struct members that will be part of the sequence.

- The macro should be used at global scope, and struct_name + The macro should be used at global scope, and struct_name should be the fully namespace qualified name of the struct to be converted.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/include/adapt_assoc_struct.hpp>
-<<<<<<< .working -

- - Example -

-=======
- + Example
->>>>>>> .merge-right.r57125 
namespace demo
 {
     struct employee
@@ -152,7 +102,7 @@
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/adapt_struct.html b/doc/html/fusion/adapted/adapt_struct.html index 99aeea58..3719bf9d 100644 --- a/doc/html/fusion/adapted/adapt_struct.html +++ b/doc/html/fusion/adapted/adapt_struct.html @@ -1,17 +1,13 @@ - - BOOST_FUSION_ADAPT_STRUCT + +BOOST_FUSION_ADAPT_STRUCT -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - - + + @@ -26,45 +22,23 @@
PrevUpHomeNext
-<<<<<<< .working -
-
- -
-
-

- - Description -

-=======
- + Description
->>>>>>> .merge-right.r57125

BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the - necessary boilerplate to make an arbitrary struct into a Random + necessary boilerplate to make an arbitrary struct into a Random Access Sequence.

-<<<<<<< .working -

- - Synopsis -

-=======
- + Synopsis
->>>>>>> .merge-right.r57125 
BOOST_FUSION_ADAPT_STRUCT(
     struct_name,
     (member_type0, member_name0)
@@ -72,55 +46,33 @@
     ...
     )
-<<<<<<< .working -

- - Semantics -

-=======
- + Semantics
->>>>>>> .merge-right.r57125

- The above macro generates the necessary code to adapt struct_name - as a model of Random - Access Sequence. The sequence of (member_typeN, - member_nameN) + The above macro generates the necessary code to adapt struct_name + as a model of Random + Access Sequence. The sequence of (member_typeN, + member_nameN) pairs declare the type and names of each of the struct members that will be part of the sequence.

- The macro should be used at global scope, and struct_name + The macro should be used at global scope, and struct_name should be the fully namespace qualified name of the struct to be converted.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
-<<<<<<< .working -

- - Example -

-=======
- + Example
->>>>>>> .merge-right.r57125 
namespace demo
 {
     struct employee
@@ -139,7 +91,7 @@
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/boost__array.html b/doc/html/fusion/adapted/boost__array.html index 5d8ea885..b0aabd33 100644 --- a/doc/html/fusion/adapted/boost__array.html +++ b/doc/html/fusion/adapted/boost__array.html @@ -1,16 +1,12 @@ - + boost::array -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,86 +22,52 @@

PrevUpHomeNext
-
-
- -
-
+
+

- This module provides adapters for boost::array. - Including the module header makes boost::array - a fully conforming Random + This module provides adapters for boost::array. + Including the module header makes boost::array + a fully conforming Random Access Sequence.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/include/array.hpp>
-<<<<<<< .working -

- - Model of -

-
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/boost__tuple.html b/doc/html/fusion/adapted/boost__tuple.html index 4d1ca99e..e90a52e3 100644 --- a/doc/html/fusion/adapted/boost__tuple.html +++ b/doc/html/fusion/adapted/boost__tuple.html @@ -1,17 +1,13 @@ - + boost::tuple -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - - + + @@ -26,71 +22,40 @@
PrevUpHomeNext
-
-
- -
-
+
+

- This module provides adapters for boost::tuple. - Including the module header makes boost::tuple - a fully conforming Forward + This module provides adapters for boost::tuple. + Including the module header makes boost::tuple + a fully conforming Forward Sequence.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/boost_tuple.hpp>
 #include <boost/fusion/include/boost_tuple.hpp>
-<<<<<<< .working -

- - Model of -

-
-

- - Example -

-=======
- + Model of
- + Example
->>>>>>> .merge-right.r57125 
boost::tuple<int,std::string> example_tuple(101, "hello");
 std::cout << *boost::fusion::begin(example_tuple) << '\n';
 std::cout << *boost::fusion::next(boost::fusion::begin(example_tuple)) << '\n';
-<<<<<<< .working -

- - See also -

-=======
- + See also
->>>>>>> .merge-right.r57125

Boost.Tuple Library @@ -98,7 +63,7 @@

-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/mpl_sequence.html b/doc/html/fusion/adapted/mpl_sequence.html index 4b04ac5e..e801606b 100644 --- a/doc/html/fusion/adapted/mpl_sequence.html +++ b/doc/html/fusion/adapted/mpl_sequence.html @@ -1,16 +1,12 @@ - + mpl sequence -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,104 +22,67 @@

PrevUpHomeNext
-
-
- -
-
+
+

This module provides adapters for MPL sequences. Including the module header makes all MPL sequences fully conforming fusion sequences.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/include/mpl.hpp>
-<<<<<<< .working -

- - Model of -

-
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/adapted/std__pair.html b/doc/html/fusion/adapted/std__pair.html index 91b6bd34..19c7ab19 100644 --- a/doc/html/fusion/adapted/std__pair.html +++ b/doc/html/fusion/adapted/std__pair.html @@ -1,16 +1,12 @@ - + std::pair -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,85 +22,51 @@

PrevUpHomeNext
-
-
- -
-
+
+

- This module provides adapters for std::pair. - Including the module header makes std::pair - a fully conforming Random + This module provides adapters for std::pair. + Including the module header makes std::pair + a fully conforming Random Access Sequence.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/adapted/std_pair.hpp>
 #include <boost/fusion/include/std_pair.hpp>
-<<<<<<< .working -

- - Model of -

-
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/algorithm.html b/doc/html/fusion/algorithm.html index d2fa59ff..7b8ab330 100644 --- a/doc/html/fusion/algorithm.html +++ b/doc/html/fusion/algorithm.html @@ -1,16 +1,12 @@ - + Algorithm -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - - - + + + @@ -26,13 +22,10 @@

PrevUpHomeNext
-
-
- -
-
+
+
Iteration
@@ -50,17 +43,10 @@
Metafunctions
-<<<<<<< .working -

- - Lazy Evaluation -

-=======

- + Lazy Evaluation

->>>>>>> .merge-right.r57125

Unlike MPL, Fusion algorithms are lazy and non sequence-type preserving. What does that mean? @@ -72,62 +58,48 @@ fusion algorithms are functional in nature such that algorithms are non mutating (no side effects). However, due to the high cost of returning full sequences such as vectors and lists, Views are returned from Fusion - algorithms instead. For example, the transform algorithm does not actually - return a transformed version of the original sequence. transform returns a transform_view. This view holds a + algorithms instead. For example, the transform algorithm does not actually + return a transformed version of the original sequence. transform returns a transform_view. This view holds a reference to the original sequence plus the transform function. Iteration over - the transform_view + the transform_view will apply the transform function over the sequence elements on demand. This lazy evaluation scheme allows us to chain as many algorithms as we want without incurring a high runtime penalty.

-<<<<<<< .working -

- - Sequence Extension -

-=======

- + Sequence Extension

->>>>>>> .merge-right.r57125

- The lazy evaluation scheme where Algorithms - return Views also allows operations such - as push_back to be totally generic. In - Fusion, push_back is actually a generic algorithm - that works on all sequences. Given an input sequence s - and a value x, Fusion's push_back algorithm simply returns - a joint_view: - a view that holds a reference to the original sequence s - and the value x. Functions + The lazy evaluation scheme where Algorithms + return Views also allows operations such + as push_back to be totally generic. In + Fusion, push_back is actually a generic algorithm + that works on all sequences. Given an input sequence s + and a value x, Fusion's push_back algorithm simply returns + a joint_view: + a view that holds a reference to the original sequence s + and the value x. Functions that were once sequence specific and need to be implemented N times over N different sequences are now implemented only once. That is to say that Fusion sequences are cheaply extensible. However, an important caveat is that the - result of a sequence extending operation like push_back does not retain the properties - of the original sequence such as associativity of set(s). To regain the original sequence, - Conversion functions - are provided. You may use one of the Conversion + result of a sequence extending operation like push_back does not retain the properties + of the original sequence such as associativity of set(s). To regain the original sequence, + Conversion functions + are provided. You may use one of the Conversion functions to convert back to the original sequence type.

-<<<<<<< .working -

- - Header -

-=======

- + Header

->>>>>>> .merge-right.r57125 
#include <boost/fusion/algorithm.hpp>
 #include <boost/fusion/include/algorithm.hpp>
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/algorithm/iteration.html b/doc/html/fusion/algorithm/iteration.html index cd49cd9a..196b56f0 100644 --- a/doc/html/fusion/algorithm/iteration.html +++ b/doc/html/fusion/algorithm/iteration.html @@ -1,16 +1,12 @@ - + Iteration -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,13 +22,10 @@

PrevUpHomeNext
-
-
- -
-
+
+
Functions
Metafunctions
@@ -41,24 +34,17 @@ The iteration algorithms provide the fundamental algorithms for traversing a sequence repeatedly applying an operation to its elements.

-<<<<<<< .working -

- - Header -

-=======
- + Header
->>>>>>> .merge-right.r57125 
#include <boost/fusion/algorithm/iteration.hpp>
 #include <boost/fusion/include/iteration.hpp>
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/algorithm/iteration/functions.html b/doc/html/fusion/algorithm/iteration/functions.html index cce8fe08..d4828078 100644 --- a/doc/html/fusion/algorithm/iteration/functions.html +++ b/doc/html/fusion/algorithm/iteration/functions.html @@ -1,16 +1,12 @@ - + Functions -<<<<<<< .working - -======= ->>>>>>> .merge-right.r57125 - + - + @@ -26,13 +22,10 @@

PrevUpHomeNext
-
-
- -
-
+
+
fold
accumulate
@@ -41,7 +34,7 @@
-
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias +
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias Schwinger

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) diff --git a/doc/html/fusion/algorithm/iteration/functions/accumulate.html b/doc/html/fusion/algorithm/iteration/functions/accumulate.html index 1b2237ef..7b559a04 100644 --- a/doc/html/fusion/algorithm/iteration/functions/accumulate.html +++ b/doc/html/fusion/algorithm/iteration/functions/accumulate.html @@ -3,18 +3,10 @@ accumulate -<<<<<<< .working - -======= -<<<<<<< .working ->>>>>>> .merge-right.r57125 - -======= ->>>>>>> .merge-right.r58299 - + @@ -30,50 +22,15 @@

PrevUpHomeNext
-
-
- -
-
+
+
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Description -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Description ->>>>>>> .merge-right.r57125

-<<<<<<< .working - For a sequence Seq, initial - state, and binary function object or function pointer f, - accumulate repeatedly applies binary f - to each element of Seq - and the previous state. -======= For a sequence seq, initial state initial_state, and binary function object or function pointer f, @@ -82,105 +39,46 @@ previous f invocation (inital_state if it is the first call) and each element of seq. ->>>>>>> .merge-right.r57125

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Synopsis -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Synopsis ->>>>>>> .merge-right.r57125 
template<
     typename Sequence,
     typename State,
     typename F
     >
-typename result_of::accumulate<Sequence, State, F>::type accumulate(
+typename result_of::accumulate<Sequence, State, F>::type accumulate(
     Sequence& seq, State const& initial_state, F const& f);
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -

Table 1.34. Parameters

- -======= -

Table 1.34. Parameters

-======= -

Table 1.38. Parameters

-======= -

Table 1.38. Parameters

-======= -

Table 1.38. Parameters

-======= -

Table 1.38. Parameters

-======= -

Table 1.38. Parameters

->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 +

Table 1.38. Parameters

->>>>>>> .merge-right.r57125 - - + - + +

+ -<<<<<<< .working - - - +

+ - - + - + +

+ -<<<<<<< .working - - - +

+ -

+

 +

Parameter -

+

+ 		+

Requirement -

+

+ 		+

Description -

- seq -

- A model of Forward - Sequence, f(eN - ....f(e2,f(e1,initial_state))) must be a valid expression for - each element e1 - to eN in seq -

-=======

seq @@ -197,33 +95,28 @@

->>>>>>> .merge-right.r57125 Operation's argument -

- initial_state -

+

 +

+ initial_state +

+ 		+

Any type -

+

+ 		+

Initial state -

- f -

- boost::result_of<F(E,S)>::type is the return type of f(e,s) - for each element e - of type E in seq, and current state s of type S -

-=======

f @@ -240,131 +133,45 @@

->>>>>>> .merge-right.r57125 Operation's argument -

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics 
accumulate(seq, initial_state, f);

- Return type: Any type + Return type: Any type

-<<<<<<< .working - Semantics: Equivalent to f(eN ....f(e2,f(e1,initial_state))) - where e1 ...eN are the elements of seq. -======= Semantics: Equivalent to f(... f(f(initial_state,e1),e2) ...eN) where e1 ...eN are the elements of seq. ->>>>>>> .merge-right.r57125

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Complexity -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Complexity ->>>>>>> .merge-right.r57125

- Linear, exactly result_of::size<Sequence>::value applications of f. + Linear, exactly result_of::size<Sequence>::value applications of f.

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Header -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Header ->>>>>>> .merge-right.r57125 
#include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/include/accumulate.hpp>
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Example -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Example ->>>>>>> .merge-right.r57125 
struct make_string
 {
@@ -377,8 +184,8 @@
     }
 };
 ...
-const vector<int,int> vec(1,2);
-assert(accumulate(vec,std::string(""), make_string()) == "12");
+const vector<int,int> vec(1,2);
+assert(accumulate(vec,std::string(""), make_string()) == "12");
diff --git a/doc/html/fusion/algorithm/iteration/functions/fold.html b/doc/html/fusion/algorithm/iteration/functions/fold.html index a831ff50..5343479a 100644 --- a/doc/html/fusion/algorithm/iteration/functions/fold.html +++ b/doc/html/fusion/algorithm/iteration/functions/fold.html @@ -3,18 +3,10 @@ fold -<<<<<<< .working - -======= -<<<<<<< .working ->>>>>>> .merge-right.r57125 - -======= ->>>>>>> .merge-right.r58299 - + @@ -30,154 +22,60 @@
PrevUpHomeNext
-
-
-
-fold -
-
-
+
+
+fold +
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Description -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Description ->>>>>>> .merge-right.r57125

-<<<<<<< .working - For a sequence Seq, initial - state, and binary function object or function pointer f, - fold repeatedly applies binary f - to each element of Seq - and the previous state. -======= For a sequence seq, initial state initial_state, and binary function object or function pointer f, fold returns the result of the repeated application of binary f to the result of the previous f invocation (inital_state if it is the first call) and each element of seq. ->>>>>>> .merge-right.r57125

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Synopsis -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Synopsis ->>>>>>> .merge-right.r57125 
template<
     typename Sequence,
     typename State,
     typename F
     >
-typename result_of::fold<Sequence, State, F>::type fold(
+typename result_of::fold<Sequence, State, F>::type fold(
     Sequence& seq, State const& initial_state, F const& f);
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -

Table 1.33. Parameters

-
-======= -

Table 1.33. Parameters

-======= -

Table 1.37. Parameters

-======= -

Table 1.37. Parameters

-======= -

Table 1.37. Parameters

-======= -

Table 1.37. Parameters

-======= -

Table 1.37. Parameters

->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 +

Table 1.37. Parameters

->>>>>>> .merge-right.r57125 - - + - + +

+ -<<<<<<< .working - - - +

+ - - + - + +

+ -<<<<<<< .working - - - +

+ -

+

 +

Parameter -

+

+ 		+

Requirement -

+

+ 		+

Description -

- seq -

- A model of Forward - Sequence,f(e,s) must be a valid expression for - each element e - in seq, and current - state s -

-=======

seq @@ -194,33 +92,28 @@

->>>>>>> .merge-right.r57125 Operation's argument -

- initial_state -

+

 +

+ initial_state +

+ 		+

Any type -

+

+ 		+

Initial state -

- f -

- boost::result_of<F(E,S)>::type is the return type of f(e,s) - for each element e - of type E in seq, and current state s of type S -

-=======

f @@ -237,131 +130,45 @@

->>>>>>> .merge-right.r57125 Operation's argument -

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics 
fold(seq, initial_state, f);

- Return type: Any type + Return type: Any type

-<<<<<<< .working - Semantics: Equivalent to f(eN ....f(e2,f(e1,initial_state))) - where e1 ...eN are the elements of seq. -======= Semantics: Equivalent to f(... f(f(initial_state,e1),e2) ...eN) where e1 ...eN are the elements of seq. ->>>>>>> .merge-right.r57125

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Complexity -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Complexity ->>>>>>> .merge-right.r57125

- Linear, exactly result_of::size<Sequence>::value applications of f. + Linear, exactly result_of::size<Sequence>::value applications of f.

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Header -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Header ->>>>>>> .merge-right.r57125 
#include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/include/fold.hpp>
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Example -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Example ->>>>>>> .merge-right.r57125 
struct make_string
 {
@@ -374,8 +181,8 @@
     }
 };
 ...
-const vector<int,int> vec(1,2);
-assert(fold(vec,std::string(""), make_string()) == "12");
+const vector<int,int> vec(1,2);
+assert(fold(vec,std::string(""), make_string()) == "12");
diff --git a/doc/html/fusion/algorithm/iteration/functions/for_each.html b/doc/html/fusion/algorithm/iteration/functions/for_each.html index 54afe3a0..81aa8f9b 100644 --- a/doc/html/fusion/algorithm/iteration/functions/for_each.html +++ b/doc/html/fusion/algorithm/iteration/functions/for_each.html @@ -3,18 +3,10 @@ for_each -<<<<<<< .working - -======= -<<<<<<< .working ->>>>>>> .merge-right.r57125 - -======= ->>>>>>> .merge-right.r58299 - + @@ -30,269 +22,126 @@
PrevUpHomeNext
-
-
- -
-
+
+
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Description -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Description ->>>>>>> .merge-right.r57125

Applies a unary function object to each element of a sequence.

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Synopsis -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Synopsis ->>>>>>> .merge-right.r57125 
template<
     typename Sequence,
     typename F
     >
-typename result_of::for_each<Sequence, F>::type for_each(
+typename result_of::for_each<Sequence, F>::type for_each(
     Sequence& seq, F const& f);
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -

Table 1.35. Parameters

-
-======= -

Table 1.35. Parameters

-======= -

Table 1.39. Parameters

-======= -

Table 1.39. Parameters

-======= -

Table 1.39. Parameters

-======= -

Table 1.39. Parameters

-======= -

Table 1.39. Parameters

->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 +

Table 1.39. Parameters

->>>>>>> .merge-right.r57125 - - + - + +

+ - - - + + +

+ - - + - + +

+ -

+

 +

Parameter -

+

+ 		+

Requirement -

+

+ 		+

Description -

- seq -

- A model of Forward - Sequence, f(e) must be a valid expression for - each element e - in seq -

+

 +

+ seq +

+ 		+

+ A model of Forward + Sequence, f(e) must be a valid expression for + each element e + in seq +

+ 		+

Operation's argument -

- f -

- A unary Regular +

 +

+ f +

+ 		+

+ A unary Regular Callable Object -

+

+ 		+

Operation's argument -

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
for_each(seq, f);
+
for_each(seq, f);
 

 

-            Return type: void
+            Return type: void
           

 

-            Semantics: Calls f(e) for each element e
-            in seq.
+            Semantics: Calls f(e) for each element e
+            in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear, exactly result_of::size<Sequence>::value applications of f.
+            Linear, exactly result_of::size<Sequence>::value applications of f.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/fusion/include/for_each.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct increment
 {
@@ -303,9 +152,9 @@
     }
 };
 ...
-vector<int,int> vec(1,2);
-for_each(vec, increment());
-assert(vec == make_vector(2,3));
+vector<int,int> vec(1,2);
+for_each(vec, increment());
+assert(vec == make_vector(2,3));
 

 
 
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions.html b/doc/html/fusion/algorithm/iteration/metafunctions.html
index adf4eff2..db18f64c 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions.html
@@ -1,16 +1,12 @@
 
-
+Metafunctions
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
-
+
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
fold

 
accumulate

@@ -41,7 +34,7 @@
 

 

 
 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html b/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
index 2ebc69ea..09122217 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/accumulate.html
@@ -3,18 +3,10 @@
 
 accumulate
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of accumulate.
+            Returns the result type of accumulate.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,86 +47,67 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.37. Parameters

-
-=======
-
Table 1.37. Parameters

-=======
-
Table 1.41. Parameters

-=======
-
Table 1.41. Parameters

-=======
-
Table 1.41. Parameters

-=======
-
Table 1.41. Parameters

-=======
-
Table 1.41. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.41. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+                

+                
+
-<<<<<<< .working
-
-
-
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   The sequence to iterate
-                

 

 

-                  State
-                

+

+                

+                  State
+                

+                		
+                

                   Any type
-                

-                  The initial state for the first application of F
-                

+                

+                  The initial state for the first application of F
+                

+                		
 

 

-                  F
-                

-                  boost::result_of<F(E,S)>::type is the return type of f(e,s)
-                  for each element e
-                  of type E in seq, and current state s of type S
-                

-=======
 

                 

                   F
@@ -204,96 +124,40 @@
                 

 
                 

->>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
-                

 

 

+

 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::accumulate<Sequence, State, F>::type
+
result_of::accumulate<Sequence, State, F>::type
 

 

-            Return type: Any type
+            Return type: Any type
           

 

-            Semantics: Returns the result of applying
-            accumulate to a sequence
-            of type Sequence, with
-            an initial state of type State
-            and binary function object or function pointer of type F.
+            Semantics: Returns the result of applying
+            accumulate to a sequence
+            of type Sequence, with
+            an initial state of type State
+            and binary function object or function pointer of type F.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear, exactly result_of::size<Sequence>::value applications of F.
+            Linear, exactly result_of::size<Sequence>::value applications of F.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/include/accumulate.hpp>
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/fold.html b/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
index 406d0184..87a86e41 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/fold.html
@@ -3,18 +3,10 @@
 
 fold
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-fold
-

-

-

+

+

+fold
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of fold.
+            Returns the result type of fold.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,86 +47,67 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.36. Parameters

-
-=======
-
Table 1.36. Parameters

-=======
-
Table 1.40. Parameters

-=======
-
Table 1.40. Parameters

-=======
-
Table 1.40. Parameters

-=======
-
Table 1.40. Parameters

-=======
-
Table 1.40. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.40. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+                

+                
+
-<<<<<<< .working
-
-
-
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   The sequence to iterate
-                

 

 

-                  State
-                

+

+                

+                  State
+                

+                		
+                

                   Any type
-                

-                  The initial state for the first application of F
-                

+                

+                  The initial state for the first application of F
+                

+                		
 

 

-                  F
-                

-                  boost::result_of<F(E,S)>::type is the return type of f(e,s)
-                  for each element e
-                  of type E in seq, and current state s of type S
-                

-=======
 

                 

                   F
@@ -204,96 +124,40 @@
                 

 
                 

->>>>>>> .merge-right.r57125
                   The operation to be applied on forward traversal
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
result_of::fold<Sequence, State, F>::type
+
result_of::fold<Sequence, State, F>::type
 

 

-            Return type: Any type
+            Return type: Any type
           

 

-            Semantics: Returns the result of applying
-            fold to a sequence of
-            type Sequence, with an
-            initial state of type State
-            and binary function object or function pointer of type F.
+            Semantics: Returns the result of applying
+            fold to a sequence of
+            type Sequence, with an
+            initial state of type State
+            and binary function object or function pointer of type F.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear, exactly result_of::size<Sequence>::value applications of F.
+            Linear, exactly result_of::size<Sequence>::value applications of F.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/include/fold.hpp>
diff --git a/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html b/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
index 0ee3af28..5f8b4a42 100644
--- a/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
+++ b/doc/html/fusion/algorithm/iteration/metafunctions/for_each.html
@@ -3,18 +3,10 @@
 
 for_each
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-            A metafunction returning the result type of applying for_each to a sequence. The
-            return type of for_each is always void.
+            A metafunction returning the result type of applying for_each to a sequence. The
+            return type of for_each is always void.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,160 +48,96 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.38. Parameters

-
-=======
-
Table 1.38. Parameters

-=======
-
Table 1.42. Parameters

-=======
-
Table 1.42. Parameters

-=======
-
Table 1.42. Parameters

-=======
-
Table 1.42. Parameters

-=======
-
Table 1.42. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.42. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  F
-                

+

+                

+                  F
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
result_of::for_each<Sequence, F>::type
+
result_of::for_each<Sequence, F>::type
 

 

-            Return type: void.
+            Return type: void.
           

 

-            Semantics: Returns the return type of
-            for_each for a sequence of type
-            Sequence and a unary
-            function object F. The
-            return type is always void.
+            Semantics: Returns the return type of
+            for_each for a sequence of type
+            Sequence and a unary
+            function object F. The
+            return type is always void.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/fusion/include/for_each.hpp>
diff --git a/doc/html/fusion/algorithm/query.html b/doc/html/fusion/algorithm/query.html
index 29d30581..d93b96b9 100644
--- a/doc/html/fusion/algorithm/query.html
+++ b/doc/html/fusion/algorithm/query.html
@@ -1,16 +1,12 @@
 
 
-
+
 Query
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-

-Query
-

-

-

+

+

+Query
+

 

 
Functions

 
Metafunctions

@@ -40,24 +33,17 @@
 

         The query algorithms provide support for searching and analyzing sequences.
       

-<<<<<<< .working
-

-
-        Header
-      

-=======
 

-
+
         Header
       

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/algorithm/query.hpp>
 #include <boost/fusion/include/query.hpp>
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions.html b/doc/html/fusion/algorithm/query/functions.html
index 687ca088..99f9f4c4 100644
--- a/doc/html/fusion/algorithm/query/functions.html
+++ b/doc/html/fusion/algorithm/query/functions.html
@@ -1,16 +1,12 @@
 
 
-
+
 Functions
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
any

 
all

@@ -45,7 +38,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/functions/all.html b/doc/html/fusion/algorithm/query/functions/all.html
index 372a2aca..851d318c 100644
--- a/doc/html/fusion/algorithm/query/functions/all.html
+++ b/doc/html/fusion/algorithm/query/functions/all.html
@@ -3,18 +3,10 @@
 
 all
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,273 +22,131 @@
 

 PrevUpHomeNext
 

-

-

-

-all
-

-

-

+

+

+all
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a sequence seq and
-            unary function object f,
-            all returns true if
-            f returns true for every
-            element of seq.
+            For a sequence seq and
+            unary function object f,
+            all returns true if
+            f returns true for every
+            element of seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::all<Sequence,F>::type all(
+typename result_of::all<Sequence,F>::type all(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.40. Parameters

-
-=======
-
Table 1.40. Parameters

-=======
-
Table 1.44. Parameters

-=======
-
Table 1.44. Parameters

-=======
-
Table 1.44. Parameters

-=======
-
Table 1.44. Parameters

-=======
-
Table 1.44. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.44. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
-                  Sequence, f(e) is a valid expression, convertible
-                  to bool, for every
-                  element e in seq
-                

+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(e) is a valid expression, convertible
+                  to bool, for every
+                  element e in seq
+                

+                		
+                

                   The sequence to search
-                

 

 

-                  f
-                

+

+                

+                  f
+                

+                		
+                

                   A unary function object
-                

+                

+                		
+                

                   The search predicate
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
all(seq, f);
+
all(seq, f);
 

 

-            Return type: bool
+            Return type: bool
           

 

-            Semantics: Returns true if and only
-            if f(e)
-            evaluates to true for every
-            element e in seq.
+            Semantics: Returns true if and only
+            if f(e)
+            evaluates to true for every
+            element e in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/fusion/include/all.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -307,8 +157,8 @@
     }
 };
 ...
-assert(all(make_vector(1,3), odd()));
-assert(!all(make_vector(1,2), odd()));
+assert(all(make_vector(1,3), odd()));
+assert(!all(make_vector(1,2), odd()));
 

 

 
diff --git a/doc/html/fusion/algorithm/query/functions/any.html b/doc/html/fusion/algorithm/query/functions/any.html
index 3ca3a419..d90e4edb 100644
--- a/doc/html/fusion/algorithm/query/functions/any.html
+++ b/doc/html/fusion/algorithm/query/functions/any.html
@@ -3,18 +3,10 @@
 any
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,273 +22,131 @@
 

 PrevUpHomeNext
 

-

-

-

-any
-

-

-

+

+

+any
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a sequence seq and
-            unary function object f,
-            any returns true if
-            f returns true for at
-            least one element of seq.
+            For a sequence seq and
+            unary function object f,
+            any returns true if
+            f returns true for at
+            least one element of seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::any<Sequence,F>::type any(
+typename result_of::any<Sequence,F>::type any(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.39. Parameters

-

 
 
 
 
 

-=======
-
Table 1.39. Parameters

-=======
-
Table 1.43. Parameters

-=======
-
Table 1.43. Parameters

-=======
-
Table 1.43. Parameters

-=======
-
Table 1.43. Parameters

-=======
-
Table 1.43. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.43. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
-                  Sequence, f(e) must be a valid expression, convertible
-                  to bool, for each
-                  element e in seq
-                

+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(e) must be a valid expression, convertible
+                  to bool, for each
+                  element e in seq
+                

+                		
+                

                   The sequence to search
-                

 

 

-                  f
-                

+

+                

+                  f
+                

+                		
+                

                   A unary function object
-                

+                

+                		
+                

                   The search predicate
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             semantics
           

-
any(seq, f);
+
any(seq, f);
 

 

-            Return type: bool
+            Return type: bool
           

 

-            Semantics: Returns true if and only
-            if f(e)
-            evaluates to true for some
-            element e in seq.
+            Semantics: Returns true if and only
+            if f(e)
+            evaluates to true for some
+            element e in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/fusion/include/any.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -307,8 +157,8 @@
     }
 };
 ...
-assert(any(make_vector(1,2), odd()));
-assert(!any(make_vector(2,4), odd()));
+assert(any(make_vector(1,2), odd()));
+assert(!any(make_vector(2,4), odd()));
diff --git a/doc/html/fusion/algorithm/query/functions/count.html b/doc/html/fusion/algorithm/query/functions/count.html index cc8291ec..df90ba60 100644 --- a/doc/html/fusion/algorithm/query/functions/count.html +++ b/doc/html/fusion/algorithm/query/functions/count.html @@ -3,18 +3,10 @@ count -<<<<<<< .working - -======= -<<<<<<< .working ->>>>>>> .merge-right.r57125 - -======= ->>>>>>> .merge-right.r58299 - + @@ -30,272 +22,130 @@
PrevUpHomeNext
-
-
-
-count -
-
-
+
+
+count +
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Description -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Description ->>>>>>> .merge-right.r57125

Returns the number of elements of a given type within a sequence.

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Synopsis -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Synopsis ->>>>>>> .merge-right.r57125 
template<
     typename Sequence,
     typename T
     >
-typename result_of::count<Sequence, T>::type count(
+typename result_of::count<Sequence, T>::type count(
     Sequence const& seq, T const& t);
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -

Table 1.44. Parameters

-
-======= -

Table 1.44. Parameters

-======= -

Table 1.48. Parameters

-======= -

Table 1.48. Parameters

-======= -

Table 1.48. Parameters

-======= -

Table 1.48. Parameters

-======= -

Table 1.48. Parameters

->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 +

Table 1.48. Parameters

->>>>>>> .merge-right.r57125 - - + - + +

+ - - - + + +

+ - - + - + +

+ -

+

 +

Parameter -

+

+ 		+

Requirement -

+

+ 		+

Description -

- seq -

- A model of Forward - Sequence, e == t - must be a valid expression, convertible to bool, - for each element e - in seq -

+

 +

+ seq +

+ 		+

+ A model of Forward + Sequence, e == t + must be a valid expression, convertible to bool, + for each element e + in seq +

+ 		+

The sequence to search -

- T -

+

 +

+ T +

+ 		+

Any type -

+

+ 		+

The type to count -

+

-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
count(seq, t);
+
count(seq, t);
 

 

-            Return type: int
+            Return type: int
           

 

-            Semantics: Returns the number of elements
-            of type T and equal to
-            t in seq.
+            Semantics: Returns the number of elements
+            of type T and equal to
+            t in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/fusion/include/count.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<double,int,int> vec(1.0,2,3);
-assert(count(vec,2) == 1);
+
const vector<double,int,int> vec(1.0,2,3);
+assert(count(vec,2) == 1);
 

 
 
diff --git a/doc/html/fusion/algorithm/query/functions/count_if.html b/doc/html/fusion/algorithm/query/functions/count_if.html
index 43a53620..1a706368 100644
--- a/doc/html/fusion/algorithm/query/functions/count_if.html
+++ b/doc/html/fusion/algorithm/query/functions/count_if.html
@@ -3,18 +3,10 @@
 count_if
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,271 +22,129 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns the number of elements within a sequence with a type for which
-            a given unary function object evaluates to true.
+            a given unary function object evaluates to true.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::count_if<Sequence, F>::type count_if(
+typename result_of::count_if<Sequence, F>::type count_if(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.45. Parameters

-

 
 
 
 
 

-=======
-
Table 1.45. Parameters

-=======
-
Table 1.49. Parameters

-=======
-
Table 1.49. Parameters

-=======
-
Table 1.49. Parameters

-=======
-
Table 1.49. Parameters

-=======
-
Table 1.49. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.49. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
-                  Sequence, f(e) is a valid expression, convertible
-                  to bool, for each
-                  element e in seq
-                

+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(e) is a valid expression, convertible
+                  to bool, for each
+                  element e in seq
+                

+                		
+                

                   The sequence to search
-                

 

 

-                  f
-                

+

+                

+                  f
+                

+                		
+                

                   A unary function object
-                

+                

+                		
+                

                   The search predicate
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
count_if(seq, f)
+
count_if(seq, f)
 

 

-            Return type: int
+            Return type: int
           

 

-            Semantics: Returns the number of elements
-            in seq where f evaluates to true.
+            Semantics: Returns the number of elements
+            in seq where f evaluates to true.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/fusion/include/count_if.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,int,int> vec(1,2,3);
-assert(count_if(vec,odd()) == 2);
+
const vector<int,int,int> vec(1,2,3);
+assert(count_if(vec,odd()) == 2);
diff --git a/doc/html/fusion/algorithm/query/functions/find.html b/doc/html/fusion/algorithm/query/functions/find.html index a06e949e..cead1370 100644 --- a/doc/html/fusion/algorithm/query/functions/find.html +++ b/doc/html/fusion/algorithm/query/functions/find.html @@ -3,18 +3,10 @@ find -<<<<<<< .working - -======= -<<<<<<< .working ->>>>>>> .merge-right.r57125 - -======= ->>>>>>> .merge-right.r58299 - + @@ -30,73 +22,20 @@
PrevUpHomeNext
-
-
-
-find -
-
-
+
+
+find +
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Description -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Description ->>>>>>> .merge-right.r57125

Finds the first element of a given type within a sequence.

-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working - - Synopsis -======= - -======= - -======= - -======= - -======= - -======= - ->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 + Synopsis ->>>>>>> .merge-right.r57125 
template<
     typename T,
@@ -111,196 +50,107 @@
 unspecified find(Sequence& seq);
-<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -<<<<<<< .working -

Table 1.42. Parameters

-
-======= -

Table 1.42. Parameters

-======= -

Table 1.46. Parameters

-======= -

Table 1.46. Parameters

-======= -

Table 1.46. Parameters

-======= -

Table 1.46. Parameters

-======= -

Table 1.46. Parameters

->>>>>>> .merge-right.r58559 ->>>>>>> .merge-right.r58549 ->>>>>>> .merge-right.r58299 ->>>>>>> .merge-right.r57337 ->>>>>>> .merge-right.r57242 +

Table 1.46. Parameters

->>>>>>> .merge-right.r57125 - - + - + +

+ - - + - + +

+ - - + - + +

+ -

+

 +

Parameter -

+

+ 		+

Requirement -

+

+ 		+

Description -

- seq -

- A model of Forward +

 +

+ seq +

+ 		+

+ A model of Forward Sequence -

+

+ 		+

The sequence to search -

- T -

+

 +

+ T +

+ 		+

Any type -

+

+ 		+

The type to search for -

+

-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
find<T>(seq)
+
find<T>(seq)
 

 

-            Return type: A model of the same iterator
-            category as the iterators of seq.
+            Return type: A model of the same iterator
+            category as the iterators of seq.
           

 

-            Semantics: Returns an iterator to the
-            first element of seq
-            of type T, or end(seq) if there is no such element. Equivalent
-            to find_if<boost::is_same<_, T> >(seq)
+            Semantics: Returns an iterator to the
+            first element of seq
+            of type T, or end(seq) if there is no such element. Equivalent
+            to find_if<boost::is_same<_, T> >(seq)
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/include/find.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<char,int> vec('a','0');
-assert(*find<int>(vec) == '0');
-assert(find<double>(vec) == end(vec));
+
const vector<char,int> vec('a','0');
+assert(*find<int>(vec) == '0');
+assert(find<double>(vec) == end(vec));
 

 
 
diff --git a/doc/html/fusion/algorithm/query/functions/find_if.html b/doc/html/fusion/algorithm/query/functions/find_if.html
index 43562c9d..60096844 100644
--- a/doc/html/fusion/algorithm/query/functions/find_if.html
+++ b/doc/html/fusion/algorithm/query/functions/find_if.html
@@ -3,18 +3,10 @@
 find_if
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,75 +22,22 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

             Finds the first element within a sequence with a type for which a given
             MPL
-            Lambda Expression evaluates to boost::mpl::true_.
+            Lambda Expression evaluates to boost::mpl::true_.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename F,
@@ -113,133 +52,94 @@
 unspecified find_if(Sequence& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.43. Parameters

-

 
 
 
 
 

-=======
-
Table 1.43. Parameters

-=======
-
Table 1.47. Parameters

-=======
-
Table 1.47. Parameters

-=======
-
Table 1.47. Parameters

-=======
-
Table 1.47. Parameters

-=======
-
Table 1.47. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.47. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   The sequence to search
-                

 

 

-                  F
-                

+

+                

+                  F
+                

+                		
+                

                   A unary MPL
                   Lambda Expression
-                

+                

+                		
+                

                   The search predicate
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
find_if<F>(seq)
+
find_if<F>(seq)
 

 

-            Return type: An iterator of the same
-            iterator category as the iterators of seq.
+            Return type: An iterator of the same
+            iterator category as the iterators of seq.
           

 

-            Semantics: Returns the first element
-            of seq for which MPL
-            Lambda Expression F
-            evaluates to boost::mpl::true_, or end(seq)
+            Semantics: Returns the first element
+            of seq for which MPL
+            Lambda Expression F
+            evaluates to boost::mpl::true_, or end(seq)
             if there is no such element.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 
    
 
  1. 
@@ -250,37 +150,12 @@
             
    2. 
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<double,int> vec(1.0,2);
-assert(*find_if<is_integral<mpl::_> >(vec) == 2);
-assert(find_if<is_class<mpl::_> >(vec) == end(vec));
+
const vector<double,int> vec(1.0,2);
+assert(*find_if<is_integral<mpl::_> >(vec) == 2);
+assert(find_if<is_class<mpl::_> >(vec) == end(vec));
 

 
 
diff --git a/doc/html/fusion/algorithm/query/functions/none.html b/doc/html/fusion/algorithm/query/functions/none.html
index 2b0b33ea..feeed992 100644
--- a/doc/html/fusion/algorithm/query/functions/none.html
+++ b/doc/html/fusion/algorithm/query/functions/none.html
@@ -3,18 +3,10 @@
 none
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,273 +22,131 @@
 

 PrevUpHomeNext
 

-

-

-

-none
-

-

-

+

+

+none
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a sequence seq and
-            unary function object f,
-            none returns true if
-            f returns false for every
-            element of seq.
+            For a sequence seq and
+            unary function object f,
+            none returns true if
+            f returns false for every
+            element of seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::none<Sequence,F>::type none(
+typename result_of::none<Sequence,F>::type none(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.41. Parameters

-

 
 
 
 
 

-=======
-
Table 1.41. Parameters

-=======
-
Table 1.45. Parameters

-=======
-
Table 1.45. Parameters

-=======
-
Table 1.45. Parameters

-=======
-
Table 1.45. Parameters

-=======
-
Table 1.45. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.45. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
-                  Sequence, f(e) is a valid expression, convertible
-                  to bool, for every
-                  element e in seq
-                

+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, f(e) is a valid expression, convertible
+                  to bool, for every
+                  element e in seq
+                

+                		
+                

                   The sequence to search
-                

 

 

-                  f
-                

+

+                

+                  f
+                

+                		
+                

                   A unary function object
-                

+                

+                		
+                

                   The search predicate
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
none(seq, f);
+
none(seq, f);
 

 

-            Return type: bool
+            Return type: bool
           

 

-            Semantics: Returns true if and only
-            if f(e)
-            evaluates to false for every
-            element e in seq. Result equivalent to !any(seq, f).
+            Semantics: Returns true if and only
+            if f(e)
+            evaluates to false for every
+            element e in seq. Result equivalent to !any(seq, f).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/fusion/include/none.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -307,8 +157,8 @@
     }
 };
 ...
-assert(none(make_vector(2,4), odd()));
-assert(!none(make_vector(1,2), odd()));
+assert(none(make_vector(2,4), odd()));
+assert(!none(make_vector(1,2), odd()));
 

 
 
diff --git a/doc/html/fusion/algorithm/query/metafunctions.html b/doc/html/fusion/algorithm/query/metafunctions.html
index 7fba2a24..9ebc4f86 100644
--- a/doc/html/fusion/algorithm/query/metafunctions.html
+++ b/doc/html/fusion/algorithm/query/metafunctions.html
@@ -1,16 +1,12 @@
 
-
+Metafunctions
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
-
+
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
any

 
all

@@ -45,7 +38,7 @@
 

 

 
 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/query/metafunctions/all.html b/doc/html/fusion/algorithm/query/metafunctions/all.html
index 35173954..82ce09bc 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/all.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/all.html
@@ -3,18 +3,10 @@
 
 all
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-all
-

-

-

+

+

+all
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            A metafunction returning the result type of all.
+            A metafunction returning the result type of all.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,164 +47,98 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.47. Parameters

-
-=======
-
Table 1.47. Parameters

-=======
-
Table 1.51. Parameters

-=======
-
Table 1.51. Parameters

-=======
-
Table 1.51. Parameters

-=======
-
Table 1.51. Parameters

-=======
-
Table 1.51. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.51. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  F
-                

-                  A model of unary Polymorphic
+

+                

+                  F
+                

+                		
+                

+                  A model of unary Polymorphic
                   Function Object
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::all<Sequence, F>::type
+
result_of::all<Sequence, F>::type
 

 

-            Return type: bool.
+            Return type: bool.
           

 

-            Semantics: Returns the return type of
-            all
-            given a sequence of type Sequence
-            and a unary Polymorphic
-            Function Object of type F.
-            The return type is always bool.
+            Semantics: Returns the return type of
+            all
+            given a sequence of type Sequence
+            and a unary Polymorphic
+            Function Object of type F.
+            The return type is always bool.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/fusion/include/all.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/any.html b/doc/html/fusion/algorithm/query/metafunctions/any.html
index 98f2f049..913292cd 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/any.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/any.html
@@ -3,18 +3,10 @@
 
 any
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-any
-

-

-

+

+

+any
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            A metafunction returning the result type of any.
+            A metafunction returning the result type of any.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,164 +47,98 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.46. Parameters

-
-=======
-
Table 1.46. Parameters

-=======
-
Table 1.50. Parameters

-=======
-
Table 1.50. Parameters

-=======
-
Table 1.50. Parameters

-=======
-
Table 1.50. Parameters

-=======
-
Table 1.50. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.50. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  F
-                

-                  A model of unary Polymorphic
+

+                

+                  F
+                

+                		
+                

+                  A model of unary Polymorphic
                   Function Object
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+
-<<<<<<< .working -
- - Expression -=======
- + Expression ->>>>>>> .merge-right.r57125 Semantics
-
result_of::any<Sequence, F>::type
+
result_of::any<Sequence, F>::type
 

 

-            Return type: bool.
+            Return type: bool.
           

 

-            Semantics: Returns the return type of
-            any
-            given a sequence of type Sequence
-            and a unary Polymorphic
-            Function Object of type F.
-            The return type is always bool.
+            Semantics: Returns the return type of
+            any
+            given a sequence of type Sequence
+            and a unary Polymorphic
+            Function Object of type F.
+            The return type is always bool.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/fusion/include/any.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/count.html b/doc/html/fusion/algorithm/query/metafunctions/count.html
index e23981b7..3b504e96 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/count.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/count.html
@@ -3,18 +3,10 @@
 
 count
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-count
-

-

-

+

+

+count
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            A metafunction that returns the result type of count
+            A metafunction that returns the result type of count
             given the sequence and search types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,158 +48,94 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.51. Parameters

-
-=======
-
Table 1.51. Parameters

-=======
-
Table 1.55. Parameters

-=======
-
Table 1.55. Parameters

-=======
-
Table 1.55. Parameters

-=======
-
Table 1.55. Parameters

-=======
-
Table 1.55. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.55. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   heading Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::count<T>::type
+
result_of::count<T>::type
 

 

-            Return type: int.
+            Return type: int.
           

 

-            Semantics: Returns the return type of
-            count. The return type is always
-            int.
+            Semantics: Returns the return type of
+            count. The return type is always
+            int.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/fusion/include/count.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/count_if.html b/doc/html/fusion/algorithm/query/metafunctions/count_if.html
index 3b91b3de..02f10dc0 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/count_if.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/count_if.html
@@ -3,18 +3,10 @@
 
 count_if
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            A metafunction that returns the result type of count_if
+            A metafunction that returns the result type of count_if
             given the sequence and predicate types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,158 +48,94 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.52. Parameters

-
-=======
-
Table 1.52. Parameters

-=======
-
Table 1.56. Parameters

-=======
-
Table 1.56. Parameters

-=======
-
Table 1.56. Parameters

-=======
-
Table 1.56. Parameters

-=======
-
Table 1.56. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.56. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A unary function object
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::count_if<Sequence, Pred>::type
+
result_of::count_if<Sequence, Pred>::type
 

 

-            Return type: int.
+            Return type: int.
           

 

-            Semantics: Returns the return type of
-            count_if. The return type is
-            always int.
+            Semantics: Returns the return type of
+            count_if. The return type is
+            always int.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/fusion/include/count_if.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/find.html b/doc/html/fusion/algorithm/query/metafunctions/find.html
index c4f18b27..6eeb4b49 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/find.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/find.html
@@ -3,18 +3,10 @@
 
 find
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,79 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-find
-

-

-

+

+

+find
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-            Returns the result type of find,
-            given the sequence and search types.
-=======
             Returns the result type of find, given the sequence and
             search types.
->>>>>>> .merge-right.r57242
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -114,160 +48,96 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.49. Parameters

-
-=======
-
Table 1.49. Parameters

-=======
-
Table 1.53. Parameters

-=======
-
Table 1.53. Parameters

-=======
-
Table 1.53. Parameters

-=======
-
Table 1.53. Parameters

-=======
-
Table 1.53. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.53. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  Model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  Model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::find<Sequence, T>::type
+
result_of::find<Sequence, T>::type
 

 

-            Return type: A model of the same iterator
-            category as the iterators of Sequence.
+            Return type: A model of the same iterator
+            category as the iterators of Sequence.
           

 

-            Semantics: Returns an iterator to the
-            first element of type T
-            in Sequence, or result_of::end<Sequence>::type
+            Semantics: Returns an iterator to the
+            first element of type T
+            in Sequence, or result_of::end<Sequence>::type
             if there is no such element.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear, at most result_of::size<Sequence>::value comparisons.
+            Linear, at most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/include/find.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/find_if.html b/doc/html/fusion/algorithm/query/metafunctions/find_if.html
index 61e3f40e..21546032 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/find_if.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/find_if.html
@@ -3,18 +3,10 @@
 
 find_if
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,79 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-            Returns the result type of find_if
-            given the sequence and predicate types.
-=======
             Returns the result type of find_if given the sequence and
             predicate types.
->>>>>>> .merge-right.r57242
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -114,161 +48,97 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.50. Parameters

-
-=======
-
Table 1.50. Parameters

-=======
-
Table 1.54. Parameters

-=======
-
Table 1.54. Parameters

-=======
-
Table 1.54. Parameters

-=======
-
Table 1.54. Parameters

-=======
-
Table 1.54. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.54. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A model of MPL
                   Lambda Expression
-                

+                

+                		
+                

                   Operation's arguments
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::find_if<Sequence, Pred>::type
+
result_of::find_if<Sequence, Pred>::type
 

 

-            Return type: A model of the same iterator
-            category as the iterators of Sequence.
+            Return type: A model of the same iterator
+            category as the iterators of Sequence.
           

 

-            Semantics: Returns an iterator to the
-            first element in Sequence
-            for which Pred evaluates
-            to true. Returns result_of::end<Sequence>::type if there is no such element.
+            Semantics: Returns an iterator to the
+            first element in Sequence
+            for which Pred evaluates
+            to true. Returns result_of::end<Sequence>::type if there is no such element.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

-            Linear. At most result_of::size<Sequence>::value comparisons.
+            Linear. At most result_of::size<Sequence>::value comparisons.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/fusion/include/find_if.hpp>
diff --git a/doc/html/fusion/algorithm/query/metafunctions/none.html b/doc/html/fusion/algorithm/query/metafunctions/none.html
index b3387567..b5137049 100644
--- a/doc/html/fusion/algorithm/query/metafunctions/none.html
+++ b/doc/html/fusion/algorithm/query/metafunctions/none.html
@@ -3,18 +3,10 @@
 
 none
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-none
-

-

-

+

+

+none
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            A metafunction returning the result type of none.
+            A metafunction returning the result type of none.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,164 +47,98 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.48. Parameters

-
-=======
-
Table 1.48. Parameters

-=======
-
Table 1.52. Parameters

-=======
-
Table 1.52. Parameters

-=======
-
Table 1.52. Parameters

-=======
-
Table 1.52. Parameters

-=======
-
Table 1.52. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.52. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  F
-                

-                  A model of unary Polymorphic
+

+                

+                  F
+                

+                		
+                

+                  A model of unary Polymorphic
                   Function Object
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::none<Sequence, F>::type
+
result_of::none<Sequence, F>::type
 

 

-            Return type: bool.
+            Return type: bool.
           

 

-            Semantics: Returns the return type of
-            none
-            given a sequence of type Sequence
-            and a unary Polymorphic
-            Function Object of type F.
-            The return type is always bool.
+            Semantics: Returns the return type of
+            none
+            given a sequence of type Sequence
+            and a unary Polymorphic
+            Function Object of type F.
+            The return type is always bool.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/fusion/include/none.hpp>
diff --git a/doc/html/fusion/algorithm/transformation.html b/doc/html/fusion/algorithm/transformation.html
index f4073ebd..9a96ba1b 100644
--- a/doc/html/fusion/algorithm/transformation.html
+++ b/doc/html/fusion/algorithm/transformation.html
@@ -1,16 +1,12 @@
 
 
-
+
 Transformation
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
Functions

 
Metafunctions

@@ -42,35 +35,28 @@
         by performing some sort of transformation. In reality the new sequences are
         views onto the data in the original sequences.
       

-

+

-

 

 [Note]
 Note
 

+

           As the transformation algorithms return views onto their input arguments,
           it is important that the lifetime of the input arguments is greater than
           the period during which you wish to use the results.
         

 

-<<<<<<< .working
-

-
-        Header
-      

-=======
 

-
+
         Header
       

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/algorithm/transformation.hpp>
 #include <boost/fusion/include/transformation.hpp>
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions.html b/doc/html/fusion/algorithm/transformation/functions.html
index 5ecc11dd..f961d36e 100644
--- a/doc/html/fusion/algorithm/transformation/functions.html
+++ b/doc/html/fusion/algorithm/transformation/functions.html
@@ -1,16 +1,12 @@
 
 
-
+
 Functions
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
filter

 
filter_if

@@ -57,7 +50,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/functions/clear.html b/doc/html/fusion/algorithm/transformation/functions/clear.html
index c7f6eca7..088bd15b 100644
--- a/doc/html/fusion/algorithm/transformation/functions/clear.html
+++ b/doc/html/fusion/algorithm/transformation/functions/clear.html
@@ -3,18 +3,10 @@
 
 clear
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,254 +22,105 @@
 

 PrevUpHomeNext
 

-

-

-

-clear
-

-

-

+

+

+clear
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            clear returns an empty sequence.
+            clear returns an empty sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
     >
-typename result_of::clear<Sequence const>::type clear(Sequence const& seq);
+typename result_of::clear<Sequence const>::type clear(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.62. Parameters

-
-=======
-
Table 1.62. Parameters

-=======
-
Table 1.66. Parameters

-=======
-
Table 1.66. Parameters

-=======
-
Table 1.66. Parameters

-=======
-
Table 1.66. Parameters

-=======
-
Table 1.66. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.66. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
clear(seq);
+
clear(seq);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Expression Semantics: Returns a sequence
+            Expression Semantics: Returns a sequence
             with no elements.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/clear.hpp>
 #include <boost/fusion/include/clear.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(clear(make_vector(1,2,3)) == make_vector());
+
assert(clear(make_vector(1,2,3)) == make_vector());
 

 

 
diff --git a/doc/html/fusion/algorithm/transformation/functions/erase.html b/doc/html/fusion/algorithm/transformation/functions/erase.html
index b94635fa..1bb329a3 100644
--- a/doc/html/fusion/algorithm/transformation/functions/erase.html
+++ b/doc/html/fusion/algorithm/transformation/functions/erase.html
@@ -3,18 +3,10 @@
 erase
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,80 +22,27 @@
 

 PrevUpHomeNext
 

-

-

-

-erase
-

-

-

+

+

+erase
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, containing all the elements of the original except
             those at a specified iterator, or between two iterators.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename First
     >
-typename result_of::erase<Sequence const, First>::type erase(
+typename result_of::erase<Sequence const, First>::type erase(
     Sequence const& seq, First const& it1);
 
 template<
@@ -111,118 +50,102 @@
     typename First,
     typename Last
     >
-typename result_of::erase<Sequence const, First, Last>::type erase(
+typename result_of::erase<Sequence const, First, Last>::type erase(
     Sequence const& seq, First const& it1, Last const& it2);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.63. Parameters

-

 
 
 
 
 

-=======
-
Table 1.63. Parameters

-=======
-
Table 1.67. Parameters

-=======
-
Table 1.67. Parameters

-=======
-
Table 1.67. Parameters

-=======
-
Table 1.67. Parameters

-=======
-
Table 1.67. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.67. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+                

+                
+
-
-
+
-
+                

+                
+
-

 
 
 
 
 

+

+                

                   Parameters
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  it1
-                

-                  A model of Forward
+

+                

+                  it1
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

-                  Iterator into seq
-                

+                

+                  Iterator into seq
+                

+                		
 

 

-                  it2
-                

-                  A model of Forward
+

+                

+                  it2
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

-                  Iterator into seq
-                  after it1
-                

+                

+                  Iterator into seq
+                  after it1
+                

+                		
 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
erase(seq, pos);
+
erase(seq, pos);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -237,20 +160,14 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq
-            except the element at pos.
+            Semantics: Returns a new sequence, containing
+            all the elements of seq
+            except the element at pos.
           

-
erase(seq, first, last);
+
erase(seq, first, last);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -265,106 +182,31 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, with
-            all the elements of seq,
-            in their original order, except those in the range [first,last).
+            Semantics: Returns a new sequence, with
+            all the elements of seq,
+            in their original order, except those in the range [first,last).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/fusion/include/erase.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int, double, char> vec(1, 2.0, 'c');
-assert(erase(vec, next(begin(vec))) == make_vector(1, 'c'));
-assert(erase(vec, next(begin(vec)), end(vec)) == make_vector(1));
+
const vector<int, double, char> vec(1, 2.0, 'c');
+assert(erase(vec, next(begin(vec))) == make_vector(1, 'c'));
+assert(erase(vec, next(begin(vec)), end(vec)) == make_vector(1));
 

 

 
diff --git a/doc/html/fusion/algorithm/transformation/functions/erase_key.html b/doc/html/fusion/algorithm/transformation/functions/erase_key.html
index 7789369c..0365dfcf 100644
--- a/doc/html/fusion/algorithm/transformation/functions/erase_key.html
+++ b/doc/html/fusion/algorithm/transformation/functions/erase_key.html
@@ -3,18 +3,10 @@
 erase_key
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,88 +22,25 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-            For an Associative
-            Sequence seq,
-            returns a Forward
-            Sequence containing all the elements of the original except those
-            with a given key.
-=======
             For an associative]
             Forward Sequence
             seq, returns a associative]
             Forward Sequence
             containing all the elements of the original except those with a given
             key.
->>>>>>> .merge-right.r57242
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Key,
@@ -120,59 +49,32 @@
 typename result_of::erase_key<Sequence const, Key>::type erase_key(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.64. Parameters

-

 
 
 
 
 

-=======
-
Table 1.64. Parameters

-=======
-
Table 1.68. Parameters

-=======
-
Table 1.68. Parameters

-=======
-
Table 1.68. Parameters

-=======
-
Table 1.68. Parameters

-=======
-
Table 1.68. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.68. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-<<<<<<< .working
-
-
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Associative
-=======
 

                 

                   seq
@@ -182,145 +84,71 @@
                 

                   A model of Forward
                   Sequence and Associative
->>>>>>> .merge-right.r57242
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Key
-                

+

+                

+                  Key
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Key to erase
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
erase_key<Key>(seq);
+
erase_key<Key>(seq);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence and Associative
             Sequence.
           

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
-            except those with key Key.
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
+            except those with key Key.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase_key.hpp>
 #include <boost/fusion/include/erase_key.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(erase_key<int>(make_map<int, long>('a', 'b')) == make_map<long>('b'));
+
assert(erase_key<int>(make_map<int, long>('a', 'b')) == make_map<long>('b'));
 

 

 
diff --git a/doc/html/fusion/algorithm/transformation/functions/filter.html b/doc/html/fusion/algorithm/transformation/functions/filter.html
index 97dd8c79..e567f308 100644
--- a/doc/html/fusion/algorithm/transformation/functions/filter.html
+++ b/doc/html/fusion/algorithm/transformation/functions/filter.html
@@ -3,18 +3,10 @@
 filter
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,174 +22,101 @@
 

 PrevUpHomeNext
 

-

-

-

-filter
-

-

-

+

+

+filter
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             For a given sequence, filter returns a new sequences containing only
             the elements of a specified type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename T,
     typename Sequence
     >
-typename result_of::filter<Sequence const, T>::type filter(Sequence const& seq);
+typename result_of::filter<Sequence const, T>::type filter(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.53. Parameters

-

 
 
 
 
 

-=======
-
Table 1.53. Parameters

-=======
-
Table 1.57. Parameters

-=======
-
Table 1.57. Parameters

-=======
-
Table 1.57. Parameters

-=======
-
Table 1.57. Parameters

-=======
-
Table 1.57. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.57. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The type to retain
-                

 

 

+

 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
filter<T>(seq);
+
filter<T>(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -212,106 +131,31 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            all the elements of seq
-            of type T. Equivalent
-            to filter_if<boost::same_type<_, T> >(seq).
+            Semantics: Returns a sequence containing
+            all the elements of seq
+            of type T. Equivalent
+            to filter_if<boost::same_type<_, T> >(seq).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter.hpp>
 #include <boost/fusion/include/filter.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,int,long,long> vec(1,2,3,4);
-assert(filter<int>(vec) == make_vector(1,2));
+
const vector<int,int,long,long> vec(1,2,3,4);
+assert(filter<int>(vec) == make_vector(1,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/filter_if.html b/doc/html/fusion/algorithm/transformation/functions/filter_if.html
index 457391ca..b0cf3d3c 100644
--- a/doc/html/fusion/algorithm/transformation/functions/filter_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/filter_if.html
@@ -3,18 +3,10 @@
 filter_if
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,176 +22,103 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a given sequence, filter_if returns a new sequences
+            For a given sequence, filter_if returns a new sequences
             containing only the elements with types for which a given MPL
-            Lambda Expression evaluates to boost::mpl::true_.
+            Lambda Expression evaluates to boost::mpl::true_.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Pred,
     typename Sequence
     >
-typename result_of::filter_if<Sequence const, Pred>::type filter_if(Sequence const& seq);
+typename result_of::filter_if<Sequence const, Pred>::type filter_if(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.54. Parameters

-

 
 
 
 
 

-=======
-
Table 1.54. Parameters

-=======
-
Table 1.58. Parameters

-=======
-
Table 1.58. Parameters

-=======
-
Table 1.58. Parameters

-=======
-
Table 1.58. Parameters

-=======
-
Table 1.58. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.58. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A unary MPL
                   Lambda Expression
-                

+                

+                		
+                

                   The predicate to filter by
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
filter_if<Pred>(seq);
+
filter_if<Pred>(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -214,107 +133,32 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            all the elements of seq
-            with types for which Pred
-            evaluates to boost::mpl::true_. The order of the retained elements
+            Semantics: Returns a sequence containing
+            all the elements of seq
+            with types for which Pred
+            evaluates to boost::mpl::true_. The order of the retained elements
             is the same as in the original sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter_if.hpp>
 #include <boost/fusion/include/filter_if.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,int,double,double> vec(1,2,3.0,4.0);
-assert(filter_if<is_integral<mpl::_> >(vec) == make_vector(1,2));
+
const vector<int,int,double,double> vec(1,2,3.0,4.0);
+assert(filter_if<is_integral<mpl::_> >(vec) == make_vector(1,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/insert.html b/doc/html/fusion/algorithm/transformation/functions/insert.html
index 5c40459b..b50ea27f 100644
--- a/doc/html/fusion/algorithm/transformation/functions/insert.html
+++ b/doc/html/fusion/algorithm/transformation/functions/insert.html
@@ -3,18 +3,10 @@
 insert
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-insert
-

-

-

+

+

+insert
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with all the elements of the original, an a new
             element inserted the position described by a given iterator.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -108,111 +47,96 @@
     Sequence const& seq, Pos const& pos, T const& t);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.65. Parameters

-

 
 
 
 
 

-=======
-
Table 1.65. Parameters

-=======
-
Table 1.69. Parameters

-=======
-
Table 1.69. Parameters

-=======
-
Table 1.69. Parameters

-=======
-
Table 1.69. Parameters

-=======
-
Table 1.69. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.69. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  pos
-                

-                  A model of Forward
+

+                

+                  pos
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   The position to insert at
-                

 

 

-                  t
-                

+

+                

+                  t
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The value to insert
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
insert(seq, p, t);
+
insert(seq, p, t);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -227,107 +151,32 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
             in their original order, and a new element with the type and value of
-            t inserted at iterator
-            pos.
+            t inserted at iterator
+            pos.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert.hpp>
 #include <boost/fusion/include/insert.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,int> vec(1,2);
-assert(insert(vec, next(begin(vec)), 3) == make_vector(1,3,2));
+
const vector<int,int> vec(1,2);
+assert(insert(vec, next(begin(vec)), 3) == make_vector(1,3,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/insert_range.html b/doc/html/fusion/algorithm/transformation/functions/insert_range.html
index a3809bf0..c1c5b5a2 100644
--- a/doc/html/fusion/algorithm/transformation/functions/insert_range.html
+++ b/doc/html/fusion/algorithm/transformation/functions/insert_range.html
@@ -3,18 +3,10 @@
 insert_range
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,191 +22,122 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with another sequence inserted at a specified
             iterator.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename Pos,
     typename Range
     >
-typename result_of::insert_range<Sequence const, Pos, Range>::type insert_range(
+typename result_of::insert_range<Sequence const, Pos, Range>::type insert_range(
     Sequence const& seq, Pos const& pos, Range const& range);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.66. Parameters

-

 
 
 
 
 

-=======
-
Table 1.66. Parameters

-=======
-
Table 1.70. Parameters

-=======
-
Table 1.70. Parameters

-=======
-
Table 1.70. Parameters

-=======
-
Table 1.70. Parameters

-=======
-
Table 1.70. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.70. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  pos
-                

-                  A model of Forward
+

+                

+                  pos
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   The position to insert at
-                

 

 

-                  range
-                

-                  A model of Forward
+

+                

+                  range
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Range to insert
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
insert(seq, pos, range);
+
insert(seq, pos, range);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -229,107 +152,32 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
-            and the elements of range
-            inserted at iterator pos.
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
+            and the elements of range
+            inserted at iterator pos.
             All elements retaining their ordering from the orignal sequences.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert_range.hpp>
 #include <boost/fusion/include/insert_range.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,int> vec(1,2);
-assert(insert_range(vec, next(begin(vec)), make_vector(3,4)) == make_vector(1,3,4,2));
+
const vector<int,int> vec(1,2);
+assert(insert_range(vec, next(begin(vec)), make_vector(3,4)) == make_vector(1,3,4,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/join.html b/doc/html/fusion/algorithm/transformation/functions/join.html
index ff8dca16..db653f21 100644
--- a/doc/html/fusion/algorithm/transformation/functions/join.html
+++ b/doc/html/fusion/algorithm/transformation/functions/join.html
@@ -3,18 +3,10 @@
 join
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,175 +22,101 @@
 

 PrevUpHomeNext
 

-

-

-

-join
-

-

-

+

+

+join
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Takes 2 sequences and returns a sequence containing the elements of the
             first followed by the elements of the second.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename LhSequence,
     typename RhSequence>
-typename result_of::join<LhSequence, RhSequence>::type join(LhSequence const& lhs, RhSequence const& rhs);
+typename result_of::join<LhSequence, RhSequence>::type join(LhSequence const& lhs, RhSequence const& rhs);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.67. Parameters

-

 
 
 
 
 

-=======
-
Table 1.67. Parameters

-=======
-
Table 1.71. Parameters

-=======
-
Table 1.71. Parameters

-=======
-
Table 1.71. Parameters

-=======
-
Table 1.71. Parameters

-=======
-
Table 1.71. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.71. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  lhs
-                

-                  A model of Forward
+

+                

+                  lhs
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  rhs
-                

-                  A model of Forward
+

+                

+                  rhs
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
join(lhs, rhs);
+
join(lhs, rhs);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -214,107 +132,32 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            all the elements of lhs
-            followed by all the elements of rhs.
+            Semantics: Returns a sequence containing
+            all the elements of lhs
+            followed by all the elements of rhs.
             The order of the elements is preserved.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/include/join.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
vector<int,char> v1(1, 'a');
-vector<int,char> v2(2, 'b');
-assert(join(v1, v2) == make_vector(1,'a',2,'b'));
+
vector<int,char> v1(1, 'a');
+vector<int,char> v2(2, 'b');
+assert(join(v1, v2) == make_vector(1,'a',2,'b'));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/pop_back.html b/doc/html/fusion/algorithm/transformation/functions/pop_back.html
index 7b9e0958..71d16629 100644
--- a/doc/html/fusion/algorithm/transformation/functions/pop_back.html
+++ b/doc/html/fusion/algorithm/transformation/functions/pop_back.html
@@ -3,18 +3,10 @@
 pop_back
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,159 +22,80 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with the last element of the original removed.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
     >
-typename result_of::pop_back<Sequence const>::type pop_back(Sequence const& seq);
+typename result_of::pop_back<Sequence const>::type pop_back(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.69. Parameters

-

 
 
 
 
 

-=======
-
Table 1.69. Parameters

-=======
-
Table 1.73. Parameters

-=======
-
Table 1.73. Parameters

-=======
-
Table 1.73. Parameters

-=======
-
Table 1.73. Parameters

-=======
-
Table 1.73. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.73. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
pop_back(seq);
+
pop_back(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -197,105 +110,30 @@
             
    • 
 

 

-            Semantics: Returns a new sequence containing
-            all the elements of seq,
+            Semantics: Returns a new sequence containing
+            all the elements of seq,
             except the last element. The elements in the new sequence are in the
-            same order as they were in seq.
+            same order as they were in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/pop_back.hpp>
 #include <boost/fusion/include/pop_back.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(___pop_back__(make_vector(1,2,3)) == make_vector(1,2));
+
assert(___pop_back__(make_vector(1,2,3)) == make_vector(1,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/pop_front.html b/doc/html/fusion/algorithm/transformation/functions/pop_front.html
index 7007e552..5d32ce45 100644
--- a/doc/html/fusion/algorithm/transformation/functions/pop_front.html
+++ b/doc/html/fusion/algorithm/transformation/functions/pop_front.html
@@ -3,18 +3,10 @@
 pop_front
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,159 +22,80 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with the first element of the original removed.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
     >
-typename result_of::pop_front<Sequence const>::type pop_front(Sequence const& seq);
+typename result_of::pop_front<Sequence const>::type pop_front(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.70. Parameters

-

 
 
 
 
 

-=======
-
Table 1.70. Parameters

-=======
-
Table 1.74. Parameters

-=======
-
Table 1.74. Parameters

-=======
-
Table 1.74. Parameters

-=======
-
Table 1.74. Parameters

-=======
-
Table 1.74. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.74. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
pop_front(seq);
+
pop_front(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -197,105 +110,30 @@
             
    • 
 

 

-            Semantics: Returns a new sequence containing
-            all the elements of seq,
+            Semantics: Returns a new sequence containing
+            all the elements of seq,
             except the first element. The elements in the new sequence are in the
-            same order as they were in seq.
+            same order as they were in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/pop_front.hpp>
 #include <boost/fusion/include/pop_front.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(pop_front(make_vector(1,2,3)) == make_vector(2,3));
+
assert(pop_front(make_vector(1,2,3)) == make_vector(2,3));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/push_back.html b/doc/html/fusion/algorithm/transformation/functions/push_back.html
index 73868212..218ea784 100644
--- a/doc/html/fusion/algorithm/transformation/functions/push_back.html
+++ b/doc/html/fusion/algorithm/transformation/functions/push_back.html
@@ -3,18 +3,10 @@
 push_back
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,174 +22,101 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with an element added at the end.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename T
     >
-typename result_of::push_back<Sequence, T>::type push_back(
+typename result_of::push_back<Sequence, T>::type push_back(
     Sequence const& seq, T const& t);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.71. Parameters

-

 
 
 
 
 

-=======
-
Table 1.71. Parameters

-=======
-
Table 1.75. Parameters

-=======
-
Table 1.75. Parameters

-=======
-
Table 1.75. Parameters

-=======
-
Table 1.75. Parameters

-=======
-
Table 1.75. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.75. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  t
-                

+

+                

+                  t
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The value to add to the end
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
push_back(seq, t);
+
push_back(seq, t);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -212,105 +131,30 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
-            and new element t appended
-            to the end. The elements are in the same order as they were in seq.
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
+            and new element t appended
+            to the end. The elements are in the same order as they were in seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/include/push_back.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(push_back(make_vector(1,2,3),4) == make_vector(1,2,3,4));
+
assert(push_back(make_vector(1,2,3),4) == make_vector(1,2,3,4));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/push_front.html b/doc/html/fusion/algorithm/transformation/functions/push_front.html
index a33eb54a..b3e628f9 100644
--- a/doc/html/fusion/algorithm/transformation/functions/push_front.html
+++ b/doc/html/fusion/algorithm/transformation/functions/push_front.html
@@ -3,18 +3,10 @@
 push_front
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,174 +22,101 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with an element added at the beginning.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename T
     >
-typename result_of::push_front<Sequence, T>::type push_front(
+typename result_of::push_front<Sequence, T>::type push_front(
     Sequence const& seq, T const& t);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.72. Parameters

-

 
 
 
 
 

-=======
-
Table 1.72. Parameters

-=======
-
Table 1.76. Parameters

-=======
-
Table 1.76. Parameters

-=======
-
Table 1.76. Parameters

-=======
-
Table 1.76. Parameters

-=======
-
Table 1.76. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.76. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  t
-                

+

+                

+                  t
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The value to add to the beginning
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
push_back(seq, t);
+
push_back(seq, t);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -212,106 +131,31 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
-            and new element t appended
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
+            and new element t appended
             to the beginning. The elements are in the same order as they were in
-            seq.
+            seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/push_front.hpp>
 #include <boost/fusion/include/push_front.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(push_front(make_vector(1,2,3),0) == make_vector(0,1,2,3));
+
assert(push_front(make_vector(1,2,3),0) == make_vector(0,1,2,3));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/remove.html b/doc/html/fusion/algorithm/transformation/functions/remove.html
index 5a6a026a..0a2f02ea 100644
--- a/doc/html/fusion/algorithm/transformation/functions/remove.html
+++ b/doc/html/fusion/algorithm/transformation/functions/remove.html
@@ -3,18 +3,10 @@
 remove
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,174 +22,101 @@
 

 PrevUpHomeNext
 

-

-

-

-remove
-

-

-

+

+

+remove
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, with all the elements of the original sequence,
             except those of a given type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename T,
     typename Sequence
     >
-typename result_of::remove<Sequence const, T>::type replace(Sequence const& seq);
+typename result_of::remove<Sequence const, T>::type replace(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.59. Parameters

-

 
 
 
 
 

-=======
-
Table 1.59. Parameters

-=======
-
Table 1.63. Parameters

-=======
-
Table 1.63. Parameters

-=======
-
Table 1.63. Parameters

-=======
-
Table 1.63. Parameters

-=======
-
Table 1.63. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.63. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Type to remove
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
remove<T>(seq);
+
remove<T>(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -212,106 +131,31 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
-            in their original order, except those of type T.
-            Equivalent to remove_if<boost::is_same<_,T> >(seq).
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
+            in their original order, except those of type T.
+            Equivalent to remove_if<boost::is_same<_,T> >(seq).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove.hpp>
 #include <boost/fusion/include/remove.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,double> vec(1,2.0);
-assert(remove<double>(vec) == make_vector(1));
+
const vector<int,double> vec(1,2.0);
+assert(remove<double>(vec) == make_vector(1));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/remove_if.html b/doc/html/fusion/algorithm/transformation/functions/remove_if.html
index f17d7697..22911110 100644
--- a/doc/html/fusion/algorithm/transformation/functions/remove_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/remove_if.html
@@ -3,18 +3,10 @@
 remove_if
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,175 +22,102 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence, containing all the elements of the original except
-            those where a given unary function object evaluates to true.
+            those where a given unary function object evaluates to true.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Pred,
     typename Sequence
     >
-typename result_of::remove_if<Sequence const, Pred>::type remove_if(Sequence const& seq);
+typename result_of::remove_if<Sequence const, Pred>::type remove_if(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.60. Parameters

-

 
 
 
 
 

-=======
-
Table 1.60. Parameters

-=======
-
Table 1.64. Parameters

-=======
-
Table 1.64. Parameters

-=======
-
Table 1.64. Parameters

-=======
-
Table 1.64. Parameters

-=======
-
Table 1.64. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.64. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A model of unary MPL
                   Lambda Expression
-                

+                

+                		
+                

                   Removal predicate
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
remove_if<Pred>(seq);
+
remove_if<Pred>(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -213,107 +132,32 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            all the elements of seq,
+            Semantics: Returns a new sequence, containing
+            all the elements of seq,
             in their original order, except those elements with types for which
-            Pred evaluates to boost::mpl::true_. Equivalent to filter<boost::mpl::not_<Pred>
-            >(seq).
+            Pred evaluates to boost::mpl::true_. Equivalent to filter<boost::mpl::not_<Pred>
+            >(seq).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove_if.hpp>
 #include <boost/fusion/include/remove_if.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
const vector<int,double> vec(1,2.0);
-assert(remove_if<is_floating_point<mpl::_> >(vec) == make_vector(1));
+
const vector<int,double> vec(1,2.0);
+assert(remove_if<is_floating_point<mpl::_> >(vec) == make_vector(1));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/replace.html b/doc/html/fusion/algorithm/transformation/functions/replace.html
index 3dd9ed7c..2591cd69 100644
--- a/doc/html/fusion/algorithm/transformation/functions/replace.html
+++ b/doc/html/fusion/algorithm/transformation/functions/replace.html
@@ -3,18 +3,10 @@
 replace
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,287 +22,150 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Replaces each value within a sequence of a given type and value with
             a new value.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename T
     >
-typename result_of::replace<Sequence const, T>::type replace(
+typename result_of::replace<Sequence const, T>::type replace(
     Sequence const& seq, T const& old_value, T const& new_value);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.57. Parameters

-

 
 
 
 
 

-=======
-
Table 1.57. Parameters

-=======
-
Table 1.61. Parameters

-=======
-
Table 1.61. Parameters

-=======
-
Table 1.61. Parameters

-=======
-
Table 1.61. Parameters

-=======
-
Table 1.61. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.61. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
-                  Sequence, e == old_value
-                  is a valid expression, convertible to bool,
-                  for each element e
-                  in seq with type
-                  convertible to T
-                

+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
+                  Sequence, e == old_value
+                  is a valid expression, convertible to bool,
+                  for each element e
+                  in seq with type
+                  convertible to T
+                

+                		
+                

                   Operation's argument
-                

 

 

-                  old_value
-                

+

+                

+                  old_value
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Value to replace
-                

 

 

-                  new_value
-                

+

+                

+                  new_value
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Replacement value
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
replace(seq, old_value, new_value);
+
replace(seq, old_value, new_value);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a new sequence with
-            all the values of seq
-            with new_value assigned
-            to elements with the same type and equal to old_value.
+            Semantics: Returns a new sequence with
+            all the values of seq
+            with new_value assigned
+            to elements with the same type and equal to old_value.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace.hpp>
 #include <boost/fusion/include/replace.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(replace(make_vector(1,2), 2, 3) == make_vector(1,3));
+
assert(replace(make_vector(1,2), 2, 3) == make_vector(1,3));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/replace_if.html b/doc/html/fusion/algorithm/transformation/functions/replace_if.html
index f8c42f47..49b63efe 100644
--- a/doc/html/fusion/algorithm/transformation/functions/replace_if.html
+++ b/doc/html/fusion/algorithm/transformation/functions/replace_if.html
@@ -3,18 +3,10 @@
 replace_if
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,285 +22,148 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Replaces each element of a given sequence for which an unary function
-            object evaluates to true
+            object evaluates to true
             replaced with a new value.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
     typename F,
     typename T>
-typename result_of::replace_if<Sequence const, F, T>::type replace_if(
+typename result_of::replace_if<Sequence const, F, T>::type replace_if(
     Sequence const& seq, F f, T const& new_value);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.58. Parameters

-

 
 
 
 
 

-=======
-
Table 1.58. Parameters

-=======
-
Table 1.62. Parameters

-=======
-
Table 1.62. Parameters

-=======
-
Table 1.62. Parameters

-=======
-
Table 1.62. Parameters

-=======
-
Table 1.62. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.62. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  f
-                

-                  A function object for which f(e) is a valid expression, convertible
-                  to bool, for each
-                  element e in seq
-                

+

+                

+                  f
+                

+                		
+                

+                  A function object for which f(e) is a valid expression, convertible
+                  to bool, for each
+                  element e in seq
+                

+                		
+                

                   Operation's argument
-                

 

 

-                  new_value
-                

+

+                

+                  new_value
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Replacement value
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
replace_if(seq, f, new_value);
+
replace_if(seq, f, new_value);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a new sequence with
-            all the elements of seq,
-            with new_value assigned
-            to each element for which f
-            evaluates to true.
+            Semantics: Returns a new sequence with
+            all the elements of seq,
+            with new_value assigned
+            to each element for which f
+            evaluates to true.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <boost/fusion/include/replace_if.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct odd
 {
@@ -319,7 +174,7 @@
     }
 };
 ...
-assert(replace_if(make_vector(1,2), odd(), 3) == make_vector(3,2));
+assert(replace_if(make_vector(1,2), odd(), 3) == make_vector(3,2));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/reverse.html b/doc/html/fusion/algorithm/transformation/functions/reverse.html
index 9fb9a821..37bfd1d0 100644
--- a/doc/html/fusion/algorithm/transformation/functions/reverse.html
+++ b/doc/html/fusion/algorithm/transformation/functions/reverse.html
@@ -3,18 +3,10 @@
 reverse
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,159 +22,80 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns a new sequence with the elements of the original in reverse order.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synposis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synposis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
     >
-typename result_of::reverse<Sequence const>::type reverse(Sequence const& seq);
+typename result_of::reverse<Sequence const>::type reverse(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.61. Parameters

-

 
 
 
 
 

-=======
-
Table 1.61. Parameters

-=======
-
Table 1.65. Parameters

-=======
-
Table 1.65. Parameters

-=======
-
Table 1.65. Parameters

-=======
-
Table 1.65. Parameters

-=======
-
Table 1.65. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.65. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  seq
-                

-                  A model of Bidirectional
+

+                

+                  seq
+                

+                		
+                

+                  A model of Bidirectional
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
reverse(seq);
+
reverse(seq);
 

 

-<<<<<<< .working
-            Return type: A model of Bidirectional
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -202,104 +115,29 @@
             
    • 
 

 

-            Semantics: Returns a new sequence containing
-            all the elements of seq
+            Semantics: Returns a new sequence containing
+            all the elements of seq
             in reverse order.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/reverse.hpp>
 #include <boost/fusion/include/reverse.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
assert(reverse(make_vector(1,2,3)) == make_vector(3,2,1));
+
assert(reverse(make_vector(1,2,3)) == make_vector(3,2,1));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/transform.html b/doc/html/fusion/algorithm/transformation/functions/transform.html
index ebf5836c..b5f6003f 100644
--- a/doc/html/fusion/algorithm/transformation/functions/transform.html
+++ b/doc/html/fusion/algorithm/transformation/functions/transform.html
@@ -3,18 +3,10 @@
 transform
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,212 +22,119 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a sequence seq and
-            function object or function pointer f,
-            transform returns a new
-            sequence with elements created by applying f(e) to each element of e
-            of seq.
+            For a sequence seq and
+            function object or function pointer f,
+            transform returns a new
+            sequence with elements created by applying f(e) to each element of e
+            of seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Unary
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Unary
->>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::transform<Sequence const, F>::type transform(
+typename result_of::transform<Sequence const, F>::type transform(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.55. Parameters

-

 
 
 
 
 

-=======
-
Table 1.55. Parameters

-=======
-
Table 1.59. Parameters

-=======
-
Table 1.59. Parameters

-=======
-
Table 1.59. Parameters

-=======
-
Table 1.59. Parameters

-=======
-
Table 1.59. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.59. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  f
-                

-                  f(e)
-                  is a valid expression for each element e
-                  of seq. boost::result_of<F(E)>::type is the return type of f when called with a value of
-                  each element type E.
-                

+

+                

+                  f
+                

+                		
+                

+                  f(e)
+                  is a valid expression for each element e
+                  of seq. boost::result_of<F(E)>::type is the return type of f when called with a value of
+                  each element type E.
+                

+                		
+                

                   Transformation function
-                

 

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
transform(seq, f);
+
transform(seq, f);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence
           

 

-            Semantics: Returns a new sequence, containing
-            the return values of f(e) for each element e
-            within seq.
+            Semantics: Returns a new sequence, containing
+            the return values of f(e) for each element e
+            within seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Binary
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Binary
->>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -243,200 +142,121 @@
     typename Sequence2,
     typename F
     >
-typename result_of::transform<Sequence1 const, Sequence2 const, F>::type transform(
+typename result_of::transform<Sequence1 const, Sequence2 const, F>::type transform(
     Sequence1 const& seq1, Sequence2 const& seq2, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.56. Parameters

-
-=======
-
Table 1.56. Parameters

-=======
-
Table 1.60. Parameters

-=======
-
Table 1.60. Parameters

-=======
-
Table 1.60. Parameters

-=======
-
Table 1.60. Parameters

-=======
-
Table 1.60. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.60. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq1
-                

-                  A model of Forward
+

+                

+                  seq1
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  seq2
-                

-                  A model of Forward
+

+                

+                  seq2
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  f
-                

-                  f(e1,e2)
-                  is a valid expression for each pair of elements e1
-                  of seq1 and e2 of seq2.
-                  boost::result_of<F(E1,E2)>::type is the return type of f when called with elements of
-                  type E1 and E2
-                

+

+                

+                  f
+                

+                		
+                

+                  f(e1,e2)
+                  is a valid expression for each pair of elements e1
+                  of seq1 and e2 of seq2.
+                  boost::result_of<F(E1,E2)>::type is the return type of f when called with elements of
+                  type E1 and E2
+                

+                		
+                

                   Transformation function
-                

 

 

+

 
-

-            Return type: A model of Forward
+

+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a new sequence, containing
-            the return values of f(e1, e2) for each pair of elements e1 and e2
-            within seq1 and seq2 respectively.
+            Semantics: Returns a new sequence, containing
+            the return values of f(e1, e2) for each pair of elements e1 and e2
+            within seq1 and seq2 respectively.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/include/transform.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct triple
 {
@@ -448,7 +268,7 @@
     };
 };
 ...
-assert(transform(make_vector(1,2,3), triple()) == make_vector(3,6,9));
+assert(transform(make_vector(1,2,3), triple()) == make_vector(3,6,9));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/functions/zip.html b/doc/html/fusion/algorithm/transformation/functions/zip.html
index b9439e4f..82304916 100644
--- a/doc/html/fusion/algorithm/transformation/functions/zip.html
+++ b/doc/html/fusion/algorithm/transformation/functions/zip.html
@@ -3,18 +3,10 @@
 zip
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-zip
-

-

-

+

+

+zip
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence1,
@@ -105,192 +44,96 @@
     ...
     typename SequenceN
     >
-typename result_of::zip<Sequence1, Sequence2, ... SequenceN>::type
+typename result_of::zip<Sequence1, Sequence2, ... SequenceN>::type
 zip(Sequence1 const& seq1, Sequence2 const& seq2, ... SequenceN const& seqN);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.68. Parameters

-

 
 
 
 
 

-=======
-
Table 1.68. Parameters

-=======
-
Table 1.72. Parameters

-=======
-
Table 1.72. Parameters

-=======
-
Table 1.72. Parameters

-=======
-
Table 1.72. Parameters

-=======
-
Table 1.72. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.72. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  seq1 to seqN
-                

-                  Each sequence is a model of Forward
+

+                

+                  seq1 to seqN
+                

+                		
+                

+                  Each sequence is a model of Forward
                   Sequence.
-                

+                

+                		
+                

                   Operation's argument
-                

 

+
 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
zip(seq1, seq2, ... seqN);
+
zip(seq1, seq2, ... seqN);
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a sequence containing
-            tuples of elements from sequences seq1
-            to seqN. For example,
-            applying zip to tuples (1, 2, 3)
-            and ('a', 'b',
-            'c')
-            would return ((1, 'a'),(2, 'b'),(3,
-            'c'))
+            Semantics: Returns a sequence containing
+            tuples of elements from sequences seq1
+            to seqN. For example,
+            applying zip to tuples (1, 2, 3)
+            and ('a', 'b',
+            'c')
+            would return ((1, 'a'),(2, 'b'),(3,
+            'c'))
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/include/zip.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
vector<int,char> v1(1, 'a');
-vector<int,char> v2(2, 'b');
-assert(zip(v1, v2) == make_vector(make_vector(1, 2),make_vector('a', 'b'));
+
vector<int,char> v1(1, 'a');
+vector<int,char> v2(2, 'b');
+assert(zip(v1, v2) == make_vector(make_vector(1, 2),make_vector('a', 'b'));
 

 
 
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions.html b/doc/html/fusion/algorithm/transformation/metafunctions.html
index 917c29d3..bb379566 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions.html
@@ -1,16 +1,12 @@
 
-
+Metafunctions
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
-
+
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
filter

 
filter_if

@@ -57,7 +50,7 @@
 

 

 
 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/clear.html b/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
index e9a88208..c3055b77 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/clear.html
@@ -3,18 +3,10 @@
 
 clear
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-clear
-

-

-

+

+

+clear
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of clear, given the input sequence
+            Returns the result type of clear, given the input sequence
             type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -108,143 +47,73 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.82. Parameters

-
-=======
-
Table 1.82. Parameters

-=======
-
Table 1.86. Parameters

-=======
-
Table 1.86. Parameters

-=======
-
Table 1.86. Parameters

-=======
-
Table 1.86. Parameters

-=======
-
Table 1.86. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.86. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  Sequence
-                

+

+                

+                  Sequence
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

+

 
-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::clear<Sequence>::type
+
result_of::clear<Sequence>::type
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns an empty sequence.
+            Semantics: Returns an empty sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/clear.hpp>
 #include <boost/fusion/include/clear.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/erase.html b/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
index ae521b7d..73ad8959 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/erase.html
@@ -3,18 +3,10 @@
 
 erase
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-erase
-

-

-

+

+

+erase
+

 

-            Returns the result type of erase, given the input sequence
+            Returns the result type of erase, given the input sequence
             and range delimiting iterator types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,113 +48,97 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.83. Parameters

-
-=======
-
Table 1.83. Parameters

-=======
-
Table 1.87. Parameters

-=======
-
Table 1.87. Parameters

-=======
-
Table 1.87. Parameters

-=======
-
Table 1.87. Parameters

-=======
-
Table 1.87. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.87. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  It1
-                

-                  A model of Forward
+

+                

+                  It1
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  It2
-                

-                  A model of Forward
+

+                

+                  It2
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::erase<Sequence, It1>::type
+
result_of::erase<Sequence, It1>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -230,81 +153,30 @@
             
    • 
 

 

-            Semantics: Returns a new sequence with
-            the element at It1 removed.
+            Semantics: Returns a new sequence with
+            the element at It1 removed.
           

-
result_of::erase<Sequence, It1, It2>::type
+
result_of::erase<Sequence, It1, It2>::type
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a new sequence with
-            the elements between It1
-            and It2 removed.
+            Semantics: Returns a new sequence with
+            the elements between It1
+            and It2 removed.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/fusion/include/erase.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html b/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
index 3f6ebd40..c5c1b08a 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/erase_key.html
@@ -3,18 +3,10 @@
 
 erase_key
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of erase_key, given the sequence
+            Returns the result type of erase_key, given the sequence
             and key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,59 +48,32 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.84. Parameters

-
-=======
-
Table 1.84. Parameters

-=======
-
Table 1.88. Parameters

-=======
-
Table 1.88. Parameters

-=======
-
Table 1.88. Parameters

-=======
-
Table 1.88. Parameters

-=======
-
Table 1.88. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.88. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-<<<<<<< .working
-
-
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Associative
-=======
 

                 

                   Sequence
@@ -171,115 +83,62 @@
                 

                   A model of Forward
                   Sequence and Associative
->>>>>>> .merge-right.r57242
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Key
-                

+

+                

+                  Key
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Key type
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::erase_key<Sequence, Key>::type
+
result_of::erase_key<Sequence, Key>::type
 

 

-<<<<<<< .working
-            Return type: A model of Associative
-=======
             Return type: A model of Forward
             Sequence and Associative
->>>>>>> .merge-right.r57242
             Sequence.
           

 

-            Semantics: Returns a sequence with the
-            elements of Sequence,
-            except those with key Key.
+            Semantics: Returns a sequence with the
+            elements of Sequence,
+            except those with key Key.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/erase_key.hpp>
 #include <boost/fusion/include/erase_key.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/filter.html b/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
index 933962df..2d9236c1 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/filter.html
@@ -3,18 +3,10 @@
 
 filter
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-filter
-

-

-

+

+

+filter
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of filter given the sequence type
+            Returns the result type of filter given the sequence type
             and type to retain.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,98 +48,78 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.73. Parameter

-
-=======
-
Table 1.73. Parameter

-=======
-
Table 1.77. Parameter

-=======
-
Table 1.77. Parameter

-=======
-
Table 1.77. Parameter

-=======
-
Table 1.77. Parameter

-=======
-
Table 1.77. Parameter

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.77. Parameter

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Type to retain
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::filter<Sequence, T>::type
+
result_of::filter<Sequence, T>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -215,72 +134,22 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            the elements of Sequence
-            that are of type T. Equivalent
-            to result_of::filter_if<Sequence,
-            boost::is_same<mpl::_, T> >::type.
+            Semantics: Returns a sequence containing
+            the elements of Sequence
+            that are of type T. Equivalent
+            to result_of::filter_if<Sequence,
+            boost::is_same<mpl::_, T> >::type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter.hpp>
 #include <boost/fusion/include/filter.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
index 1625ab4a..b4b65b1a 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/filter_if.html
@@ -3,18 +3,10 @@
 
 filter_if
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,75 +22,22 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of filter_if given the sequence
+            Returns the result type of filter_if given the sequence
             and unary MPL
             Lambda Expression predicate type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -110,99 +49,79 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.74. Parameter

-
-=======
-
Table 1.74. Parameter

-=======
-
Table 1.78. Parameter

-=======
-
Table 1.78. Parameter

-=======
-
Table 1.78. Parameter

-=======
-
Table 1.78. Parameter

-=======
-
Table 1.78. Parameter

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.78. Parameter

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A unary MPL
                   Lambda Expression
-                

+                

+                		
+                

                   Type to retain
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::filter_if<Sequence, Pred>::type
+
result_of::filter_if<Sequence, Pred>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -217,71 +136,21 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            the elements of Sequence
-            for which Pred evaluates
-            to boost::mpl::true_.
+            Semantics: Returns a sequence containing
+            the elements of Sequence
+            for which Pred evaluates
+            to boost::mpl::true_.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/filter_if.hpp>
 #include <boost/fusion/include/filter_if.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/insert.html b/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
index 936e491f..bb8e7538 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/insert.html
@@ -3,18 +3,10 @@
 
 insert
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-insert
-

-

-

+

+

+insert
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of insert, given the sequence,
+            Returns the result type of insert, given the sequence,
             position iterator and insertion types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -110,111 +49,96 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.85. Parameters

-
-=======
-
Table 1.85. Parameters

-=======
-
Table 1.89. Parameters

-=======
-
Table 1.89. Parameters

-=======
-
Table 1.89. Parameters

-=======
-
Table 1.89. Parameters

-=======
-
Table 1.89. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.89. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Position
-                

-                  A model of Forward
+

+                

+                  Position
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::insert<Sequence, Position, T>::type
+
result_of::insert<Sequence, Position, T>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -229,71 +153,21 @@
             
    • 
 

 

-            Semantics: Returns a sequence with an
-            element of type T inserted
-            at position Position
-            in Sequence.
+            Semantics: Returns a sequence with an
+            element of type T inserted
+            at position Position
+            in Sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert.hpp>
 #include <boost/fusion/include/insert.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html b/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
index d237f371..ac1e5f14 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/insert_range.html
@@ -3,18 +3,10 @@
 
 insert_range
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of insert_range, given the input
+            Returns the result type of insert_range, given the input
             sequence, position iterator and insertion range types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -110,113 +49,97 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.86. Parameters

-
-=======
-
Table 1.86. Parameters

-=======
-
Table 1.90. Parameters

-=======
-
Table 1.90. Parameters

-=======
-
Table 1.90. Parameters

-=======
-
Table 1.90. Parameters

-=======
-
Table 1.90. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.90. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Position
-                

-                  A model of Forward
+

+                

+                  Position
+                

+                		
+                

+                  A model of Forward
                   Iterator
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Range
-                

-                  A model of Forward
+

+                

+                  Range
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::insert_range<Sequence, Position, Range>::type
+
result_of::insert_range<Sequence, Position, Range>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -231,71 +154,21 @@
             
    • 
 

 

-            Semantics: Returns a sequence with the
-            elements of Range inserted
-            at position Position
-            into Sequence.
+            Semantics: Returns a sequence with the
+            elements of Range inserted
+            at position Position
+            into Sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/insert_range.hpp>
 #include <boost/fusion/include/insert_range.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/join.html b/doc/html/fusion/algorithm/transformation/metafunctions/join.html
index 04ece394..ee4a7894 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/join.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/join.html
@@ -3,18 +3,10 @@
 
 join
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-join
-

-

-

+

+

+join
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Returns the result of joining 2 sequences, given the sequence types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename LhSequence,
@@ -108,45 +47,14 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::join<LhSequence, RhSequence>::type
+
result_of::join<LhSequence, RhSequence>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -162,71 +70,21 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            the elements of LhSequence
-            followed by the elements of RhSequence.
+            Semantics: Returns a sequence containing
+            the elements of LhSequence
+            followed by the elements of RhSequence.
             The order of the elements in the 2 sequences is preserved.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/include/join.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html b/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
index 55059d1b..d20ea2da 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/pop_back.html
@@ -3,18 +3,10 @@
 
 pop_back
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of pop_back, given the input sequence
+            Returns the result type of pop_back, given the input sequence
             type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -108,85 +47,59 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.87. Parameters

-
-=======
-
Table 1.87. Parameters

-=======
-
Table 1.91. Parameters

-=======
-
Table 1.91. Parameters

-=======
-
Table 1.91. Parameters

-=======
-
Table 1.91. Parameters

-=======
-
Table 1.91. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.91. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::pop_back<Sequence>::type
+
result_of::pop_back<Sequence>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -201,70 +114,20 @@
             
    • 
 

 

-            Semantics: Returns a sequence with all
-            the elements of Sequence
+            Semantics: Returns a sequence with all
+            the elements of Sequence
             except the last element.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/pop_back.hpp>
 #include <boost/fusion/include/pop_back.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html b/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
index b3b2f61a..e87265cf 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/pop_front.html
@@ -3,18 +3,10 @@
 
 pop_front
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of pop_front, given the input sequence
+            Returns the result type of pop_front, given the input sequence
             type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -108,85 +47,59 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.88. Parameters

-
-=======
-
Table 1.88. Parameters

-=======
-
Table 1.92. Parameters

-=======
-
Table 1.92. Parameters

-=======
-
Table 1.92. Parameters

-=======
-
Table 1.92. Parameters

-=======
-
Table 1.92. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.92. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::pop_front<Sequence>::type
+
result_of::pop_front<Sequence>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -201,44 +114,19 @@
             
    • 
 

 

-            Semantics: Returns a sequence with all
-            the elements of Sequence
+            Semantics: Returns a sequence with all
+            the elements of Sequence
             except the first element.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-
+
             Header
           

 
#include <boost/fusion/algorithm/transformation/pop_front.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html b/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
index 16cc7532..de0911fd 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/push_back.html
@@ -3,18 +3,10 @@
 
 push_back
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of push_back, given the types of
+            Returns the result type of push_back, given the types of
             the input sequence and element to push.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,98 +48,78 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.89. Parameters

-
-=======
-
Table 1.89. Parameters

-=======
-
Table 1.93. Parameters

-=======
-
Table 1.93. Parameters

-=======
-
Table 1.93. Parameters

-=======
-
Table 1.93. Parameters

-=======
-
Table 1.93. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.93. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::push_back<Sequence, T>::type
+
result_of::push_back<Sequence, T>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -215,45 +134,20 @@
             
    • 
 

 

-            Semantics: Returns a sequence with the
-            elements of Sequence
-            and an element of type T
+            Semantics: Returns a sequence with the
+            elements of Sequence
+            and an element of type T
             added to the end.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-
+
             Header
           

 
#include <boost/fusion/algorithm/transformation/push_back.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html b/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
index 5a10ef69..73387e9b 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/push_front.html
@@ -3,18 +3,10 @@
 
 push_front
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of push_front, given the types
+            Returns the result type of push_front, given the types
             of the input sequence and element to push.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,98 +48,78 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.90. Parameters

-
-=======
-
Table 1.90. Parameters

-=======
-
Table 1.94. Parameters

-=======
-
Table 1.94. Parameters

-=======
-
Table 1.94. Parameters

-=======
-
Table 1.94. Parameters

-=======
-
Table 1.94. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.94. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::push_front<Sequence, T>::type
+
result_of::push_front<Sequence, T>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -215,45 +134,20 @@
             
    • 
 

 

-            Semantics: Returns a sequence with the
-            elements of Sequence
-            and an element of type T
+            Semantics: Returns a sequence with the
+            elements of Sequence
+            and an element of type T
             added to the beginning.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-
+
             Header
           

 
#include <boost/fusion/algorithm/transformation/push_front.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/remove.html b/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
index e6530ea7..519ae0d5 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/remove.html
@@ -3,18 +3,10 @@
 
 remove
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-remove
-

-

-

+

+

+remove
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of remove, given the sequence and
+            Returns the result type of remove, given the sequence and
             removal types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,98 +48,78 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.79. Parameters

-
-=======
-
Table 1.79. Parameters

-=======
-
Table 1.83. Parameters

-=======
-
Table 1.83. Parameters

-=======
-
Table 1.83. Parameters

-=======
-
Table 1.83. Parameters

-=======
-
Table 1.83. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.83. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   Remove elements of this type
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::remove<Sequence, T>::type
+
result_of::remove<Sequence, T>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -215,72 +134,22 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            the elements of Sequence
-            not of type T. Equivalent
-            to result_of::replace_if<Sequence,
-            boost::is_same<mpl::_, T> >::type.
+            Semantics: Returns a sequence containing
+            the elements of Sequence
+            not of type T. Equivalent
+            to result_of::replace_if<Sequence,
+            boost::is_same<mpl::_, T> >::type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove.hpp>
 #include <boost/fusion/include/remove.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
index e96d0bce..4fe0e0ef 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/remove_if.html
@@ -3,18 +3,10 @@
 
 remove_if
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,75 +22,22 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of remove_if, given the input sequence
+            Returns the result type of remove_if, given the input sequence
             and unary MPL
             Lambda Expression predicate types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -110,99 +49,79 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.80. Parameters

-
-=======
-
Table 1.80. Parameters

-=======
-
Table 1.84. Parameters

-=======
-
Table 1.84. Parameters

-=======
-
Table 1.84. Parameters

-=======
-
Table 1.84. Parameters

-=======
-
Table 1.84. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.84. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+                

+                
+
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  Pred
-                

+

+                

+                  Pred
+                

+                		
+                

                   A model of unary MPL
                   Lambda Expression
-                

-                  Remove elements which evaluate to boost::mpl::true_
-                

+                

+                  Remove elements which evaluate to boost::mpl::true_
+                

+                		
 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::remove_if<Sequence, Pred>::type
+
result_of::remove_if<Sequence, Pred>::type
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -217,71 +136,21 @@
             
    • 
 

 

-            Semantics: Returns a sequence containing
-            the elements of Sequence
-            for which Pred evaluates
-            to boost::mpl::false_.
+            Semantics: Returns a sequence containing
+            the elements of Sequence
+            for which Pred evaluates
+            to boost::mpl::false_.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/remove_if.hpp>
 #include <boost/fusion/include/remove_if.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/replace.html b/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
index cef78d29..b756d5a1 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/replace.html
@@ -3,18 +3,10 @@
 
 replace
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of replace, given the types of
+            Returns the result type of replace, given the types of
             the input sequence and element to replace.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -109,159 +48,94 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.77. Parameters

-
-=======
-
Table 1.77. Parameters

-=======
-
Table 1.81. Parameters

-=======
-
Table 1.81. Parameters

-=======
-
Table 1.81. Parameters

-=======
-
Table 1.81. Parameters

-=======
-
Table 1.81. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.81. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The type of the search and replacement objects
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::replace<Sequence,T>::type
+
result_of::replace<Sequence,T>::type
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns the return type of
-            replace.
+            Semantics: Returns the return type of
+            replace.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace.hpp>
 #include <boost/fusion/include/replace.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html b/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
index 7278ad67..b7d26a4f 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/replace_if.html
@@ -3,18 +3,10 @@
 
 replace_if
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,76 +22,22 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of replace_if, given the types
-            of the sequence, Polymorphic
+            Returns the result type of replace_if, given the types
+            of the sequence, Polymorphic
             Function Object predicate and replacement object.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence,
@@ -111,172 +49,112 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.78. Parameters

-
-=======
-
Table 1.78. Parameters

-=======
-
Table 1.82. Parameters

-=======
-
Table 1.82. Parameters

-=======
-
Table 1.82. Parameters

-=======
-
Table 1.82. Parameters

-=======
-
Table 1.82. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.82. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  Sequence
-                

-                  A model of Forward
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  F
-                

-                  A model of unary Polymorphic
+

+                

+                  F
+                

+                		
+                

+                  A model of unary Polymorphic
                   Function Object
-                

+                

+                		
+                

                   Replacement predicate
-                

 

 

-                  T
-                

+

+                

+                  T
+                

+                		
+                

                   Any type
-                

+                

+                		
+                

                   The type of the replacement object
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::replace_if<Sequence,F,T>::type
+
result_of::replace_if<Sequence,F,T>::type
 

 

-            Return type: A model of Forward
+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns the return type of
-            replace_if.
+            Semantics: Returns the return type of
+            replace_if.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <boost/fusion/include/replace_if.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html b/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
index 3e783b13..e2b22ce0 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/reverse.html
@@ -3,18 +3,10 @@
 
 reverse
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of reverse, given the input sequence
+            Returns the result type of reverse, given the input sequence
             type.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence
@@ -108,85 +47,59 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.81. Parameters

-
-=======
-
Table 1.81. Parameters

-=======
-
Table 1.85. Parameters

-=======
-
Table 1.85. Parameters

-=======
-
Table 1.85. Parameters

-=======
-
Table 1.85. Parameters

-=======
-
Table 1.85. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.85. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 

-                  Sequence
-                

-                  A model of Bidirectional
+

+                

+                  Sequence
+                

+                		
+                

+                  A model of Bidirectional
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::reverse<Sequence>::type
+
result_of::reverse<Sequence>::type
 

 

-<<<<<<< .working
-            Return type: A model of Bidirectional
-            Sequence.
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -206,69 +119,19 @@
             
    • 
 

 

-            Semantics: Returns a sequence with the
-            elements in the reverse order to Sequence.
+            Semantics: Returns a sequence with the
+            elements in the reverse order to Sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/reverse.hpp>
 #include <boost/fusion/include/reverse.hpp>
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/transform.html b/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
index 046b8b5c..7d1c3e94 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/transform.html
@@ -3,18 +3,10 @@
 
 transform
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,182 +22,109 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            For a sequence seq and
-            function object or function pointer f,
-            transform returns a new
-            sequence with elements created by applying f(e) to each element of e
-            of seq.
+            For a sequence seq and
+            function object or function pointer f,
+            transform returns a new
+            sequence with elements created by applying f(e) to each element of e
+            of seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Unary
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Unary
->>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
     typename Sequence,
     typename F
     >
-typename result_of::transform<Sequence const, F>::type transform(
+typename result_of::transform<Sequence const, F>::type transform(
     Sequence const& seq, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.75. Parameters

-
-=======
-
Table 1.75. Parameters

-=======
-
Table 1.79. Parameters

-=======
-
Table 1.79. Parameters

-=======
-
Table 1.79. Parameters

-=======
-
Table 1.79. Parameters

-=======
-
Table 1.79. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.79. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq
-                

-                  A model of Forward
+

+                

+                  seq
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  f
-                

-                  f(e)
-                  is a valid expression for each element e
-                  of seq. boost::result_of<F(E)>::type is the return type of f when called with a value of
-                  each element type E.
-                

+

+                

+                  f
+                

+                		
+                

+                  f(e)
+                  is a valid expression for each element e
+                  of seq. boost::result_of<F(E)>::type is the return type of f when called with a value of
+                  each element type E.
+                

+                		
+                

                   Transformation function
-                

 

 

+

 

-<<<<<<< .working
-

-
-            Expression
-=======
 

-
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
transform(seq, f);
+
transform(seq, f);
 

 

-<<<<<<< .working
-            Return type: A model of Forward
-            Sequence
-=======
             Return type:
->>>>>>> .merge-right.r57242
           

 
    
 
  • 
@@ -220,38 +139,13 @@
             
    • 
 

 

-            Semantics: Returns a new sequence, containing
-            the return values of f(e) for each element e
-            within seq.
+            Semantics: Returns a new sequence, containing
+            the return values of f(e) for each element e
+            within seq.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Binary
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Binary
->>>>>>> .merge-right.r57125
             version synopsis
           

 
template<
@@ -259,200 +153,121 @@
     typename Sequence2,
     typename F
     >
-typename result_of::transform<Sequence1 const, Sequence2 const, F>::type transform(
+typename result_of::transform<Sequence1 const, Sequence2 const, F>::type transform(
     Sequence1 const& seq1, Sequence2 const& seq2, F f);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
Table 1.76. Parameters

-
-=======
-
Table 1.76. Parameters

-=======
-
Table 1.80. Parameters

-=======
-
Table 1.80. Parameters

-=======
-
Table 1.80. Parameters

-=======
-
Table 1.80. Parameters

-=======
-
Table 1.80. Parameters

->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
Table 1.80. Parameters

 

->>>>>>> .merge-right.r57125
 
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
+
-
+
+                

+                
-
-
-
+
+
+                

+                
-

 
 
 
 
 

+

+                

                   Parameter
-                

+                

+                		
+                

                   Requirement
-                

+                

+                		
+                

                   Description
-                

 

 
 

-                  seq1
-                

-                  A model of Forward
+

+                

+                  seq1
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  seq2
-                

-                  A model of Forward
+

+                

+                  seq2
+                

+                		
+                

+                  A model of Forward
                   Sequence
-                

+                

+                		
+                

                   Operation's argument
-                

 

 

-                  f
-                

-                  f(e1,e2)
-                  is a valid expression for each pair of elements e1
-                  of seq1 and e2 of seq2.
-                  boost::result_of<F(E1,E2)>::type is the return type of f when called with elements of
-                  type E1 and E2
-                

+

+                

+                  f
+                

+                		
+                

+                  f(e1,e2)
+                  is a valid expression for each pair of elements e1
+                  of seq1 and e2 of seq2.
+                  boost::result_of<F(E1,E2)>::type is the return type of f when called with elements of
+                  type E1 and E2
+                

+                		
+                

                   Transformation function
-                

 

 

+

 

-

-            Return type: A model of Forward
+

+            Return type: A model of Forward
             Sequence.
           

 

-            Semantics: Returns a new sequence, containing
-            the return values of f(e1, e2) for each pair of elements e1 and e2
-            within seq1 and seq2 respectively.
+            Semantics: Returns a new sequence, containing
+            the return values of f(e1, e2) for each pair of elements e1 and e2
+            within seq1 and seq2 respectively.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant. Returns a view which is lazily evaluated.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/fusion/include/transform.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct triple
 {
@@ -464,7 +279,7 @@
     };
 };
 ...
-assert(transform(make_vector(1,2,3), triple()) == make_vector(3,6,9));
+assert(transform(make_vector(1,2,3), triple()) == make_vector(3,6,9));
 

 

 
diff --git a/doc/html/fusion/algorithm/transformation/metafunctions/zip.html b/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
index 15e113a8..99187ce0 100644
--- a/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
+++ b/doc/html/fusion/algorithm/transformation/metafunctions/zip.html
@@ -3,18 +3,10 @@
 zip
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,74 +22,21 @@
 

 PrevUpHomeNext
 

-

-

-

-zip
-

-

-

+

+

+zip
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

             Zips sequences together to form a single sequence, whos members are tuples
             of the members of the component sequences.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template<
     typename Sequence1,
@@ -111,112 +50,37 @@
 };
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

-
result_of::zip<Sequence1, Sequence2, ... SequenceN>::type
+
result_of::zip<Sequence1, Sequence2, ... SequenceN>::type
 

 

-            Return type: A model of the most restrictive
-            traversal category of sequences Sequence1
-            to SequenceN.
+            Return type: A model of the most restrictive
+            traversal category of sequences Sequence1
+            to SequenceN.
           

 

-            Semantics: Return a sequence containing
+            Semantics: Return a sequence containing
             tuples of elements from each sequence. For example, applying zip to tuples
-            (1, 2,
-            3)
-            and ('a', 'b',
-            'c')
-            would return ((1, 'a'),(2, 'b'),(3,
-            'c'))
+            (1, 2,
+            3)
+            and ('a', 'b',
+            'c')
+            would return ((1, 'a'),(2, 'b'),(3,
+            'c'))
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Complexity
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Complexity
->>>>>>> .merge-right.r57125
           

 

             Constant.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/include/zip.hpp>
diff --git a/doc/html/fusion/change_log.html b/doc/html/fusion/change_log.html
index 0bbafa8e..8ce4bb0a 100644
--- a/doc/html/fusion/change_log.html
+++ b/doc/html/fusion/change_log.html
@@ -1,16 +1,12 @@
 
 
-
+
 Change log
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
-
-
+
+
+
 
 
 
@@ -26,48 +22,53 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

       This section summarizes significant changes to the Fusion library.
     

-
    
-
  • 
-        Sep 27, 2006: Added boost::tuple
+
      
+
    • 
+        Sep 27, 2006: Added boost::tuple
         support. (Joel de Guzman)
       
      • 
-
    • 
-        Nov 17, 2006: Added boost::variant
+
    • 
+        Nov 17, 2006: Added boost::variant
         support. (Joel de Guzman)
       
      • 
-
    • 
+
    • 
         Feb 15, 2007: Added functional module. (Tobias Schwinger)
       
      • 
-
    • 
-        APRIL 2, 2007: Added struct adapter. (Joel de Guzman)
+
    • 
+        April 2, 2007: Added struct adapter. (Joel de Guzman)
       
      • 
-
    • 
+
    • 
         May 8, 2007: Added associative struct adapter. (Dan Marsden)
       
      • 
-
    • 
-        Dec 20, 2007: Removed boost::variant
+
    • 
+        Dec 20, 2007: Removed boost::variant
         support. After thorough investigation, I think now that the move to make
         variant a fusion sequence is rather quirky. A variant will always have a
         size==1 regardless of the number of types it can contain and there's no way
         to know at compile time what it contains. Iterating over its types is simply
-        wrong. All these imply that the variant is not
+        wrong. All these imply that the variant is not
         a fusion sequence. (Joel de Guzman)
       
      • 
+
    • 
+        Oct 12, 2009: The accumulator is the first argument to the functor of fold
+        and accumulate. (Christopher Schmidt)
+      
      • 
+
    • 
+        Oct 30, 2009: Added support for associative iterators and views. (Christopher
+        Schmidt)
+      
      • 
 
    
 

 

 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container.html b/doc/html/fusion/container.html
index cf391ce5..cda425aa 100644
--- a/doc/html/fusion/container.html
+++ b/doc/html/fusion/container.html
@@ -1,17 +1,12 @@
 
 
-
+
 Container
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
-
-
+
+
+
 
 
 
@@ -27,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
vector

 
cons

@@ -53,27 +45,20 @@
 

 

       Fusion provides a few predefined sequences out of the box. These containers
-      actually hold heterogenously typed data; unlike Views.
+      actually hold heterogenously typed data; unlike Views.
       These containers are more or less counterparts of those in STL.
     

-<<<<<<< .working
-

-
-      Header
-    

-=======
 

-
+
       Header
     

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/container.hpp>
 #include <boost/fusion/include/container.hpp>
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/cons.html b/doc/html/fusion/container/cons.html
index cb736f0f..844fb56d 100644
--- a/doc/html/fusion/container/cons.html
+++ b/doc/html/fusion/container/cons.html
@@ -1,16 +1,12 @@
 
 
-
+
 cons
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,79 +22,43 @@
 

 PrevUpHomeNext
 

-<<<<<<< .working
-

-

-

-cons
-

-

-

-

-
-        Description
-      

-=======
 

 

 

-
+
         Description
       

->>>>>>> .merge-right.r57125
 

-        cons is a simple Forward
-        Sequence. It is a lisp style recursive list structure where car is the head and
-        cdr is the tail:
-        usually another cons structure or nil:
-        the empty list. Fusion's list is built on top of this more
-        primitive data structure. It is more efficient than vector when the target sequence
+        cons is a simple Forward
+        Sequence. It is a lisp style recursive list structure where car is the head and
+        cdr is the tail:
+        usually another cons structure or nil:
+        the empty list. Fusion's list is built on top of this more
+        primitive data structure. It is more efficient than vector when the target sequence
         is constructed piecemeal (a data at a time). The runtime cost of access to
-        each element is peculiarly constant (see Recursive
+        each element is peculiarly constant (see Recursive
         Inlined Functions).
       

-<<<<<<< .working
-

-
-        Header
-      

-=======
 

-
+
         Header
       

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/include/cons.hpp>
 

-<<<<<<< .working
-

-
-        Synopsis
-      

-=======
 

-
+
         Synopsis
       

->>>>>>> .merge-right.r57125
 
template <typename Car, typename Cdr = nil>
 struct cons;
 

-<<<<<<< .working
-

-
-        Template parameters
-      

-=======
 

-
+
         Template parameters
       

->>>>>>> .merge-right.r57125
 
@@ -106,106 +66,105 @@
 
-
-
+
-
+
+              

+              
-
-
+
-
+              

+              
+
-
-
+
-
+              

+              
+

 
 

 
 

+

+              

                 Parameter
-              

+              

+              		
+              

                 Description
-              

+              

+              		
+              

                 Default
-              

 

 
 

-                Car
-              

+

+              

+                Car
+              

+              		
+              

                 Head type
-              

-              

+              

+              

+              		
 

 

-                Cdr
-              

+

+              

+                Cdr
+              

+              		
+              

                 Tail type
-              

-                nil
-              

+              

+                nil
+              

+              		
 

 
 

-<<<<<<< .working
-

-
-        Model of
-      

-

-

-=======
 

-
+
         Model of
       

 

 

->>>>>>> .merge-right.r57125
 
Notation

 

-
nil

+
nil

 

-            An empty cons
+            An empty cons
           

-
C

+
C

 

-            A cons type
+            A cons type
           

-
l,
-        l2

+
l,
+        l2

 

-            Instances of cons
+            Instances of cons
           

-
car

+
car

 

             An arbitrary data
           

-
cdr

+
cdr

 

-            Another cons list
+            Another cons list
           

-
s

+
s

 

-            A Forward Sequence
+            A Forward Sequence
           

-
N

+
N

 

             An MPL
             Integral Constant
           

 

 

-<<<<<<< .working
-

-
-        Expression Semantics
-      

-=======
 

-
+
         Expression Semantics
       

->>>>>>> .merge-right.r57125
 

         Semantics of an expression is defined only where it differs from, or is not
-        defined in Forward
+        defined in Forward
         Sequence.
       

 

@@ -214,114 +173,136 @@
 
-
-
+
+              

+              
-
-
+
+              

+              
-
-
+
+              

+              
-
-
+
+              

+              
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 
 

+

+              

                 Expression
-              

+              

+              		
+              

                 Semantics
-              

 

 
 

-                nil()
-              

+

+              

+                nil()
+              

+              		
+              

                 Creates an empty list.
-              

 

 

-                C()
-              

+

+              

+                C()
+              

+              		
+              

                 Creates a cons with default constructed elements.
-              

 

 

-                C(car)
-              

-                Creates a cons with car
+

+              

+                C(car)
+              

+              		
+              

+                Creates a cons with car
                 head and default constructed tail.
-              

 

 

-                C(car,
-                cdr)
-              

-                Creates a cons with car
-                head and cdr tail.
-              

+              

+                C(car,
+                cdr)
+              

+              		
+              

+                Creates a cons with car
+                head and cdr tail.
+              

+              		
 

 

-                C(s)
-              

-                Copy constructs a cons from a Forward
-                Sequence, s.
-              

+              

+                C(s)
+              

+              		
+              

+                Copy constructs a cons from a Forward
+                Sequence, s.
+              

+              		
 

 

-                l =
-                s
-              

-                Assigns to a cons, l,
-                from a Forward
-                Sequence, s.
-              

+              

+                l =
+                s
+              

+              		
+              

+                Assigns to a cons, l,
+                from a Forward
+                Sequence, s.
+              

+              		
 

 

-                at<N>(l)
-              

-                The Nth element from the beginning of the sequence; see at.
-              

+              

+                at<N>(l)
+              

+              		
+              

+                The Nth element from the beginning of the sequence; see at.
+              

+              		
 

 
 

-

-        note at<N>(l) is provided
+

+

+

+        note at<N>(l) is provided
         for convenience and compatibility with the original Boost.Tuple
-        library, despite cons being
-        a Forward Sequence
-        only (at is supposed to be
-        a Random
-        Access Sequence requirement). The runtime complexity of at is constant (see Recursive
+        library, despite cons being
+        a Forward Sequence
+        only (at is supposed to be
+        a Random
+        Access Sequence requirement). The runtime complexity of at is constant (see Recursive
         Inlined Functions).
-<<<<<<< .working
-      

-

-
-        Example
-      

-=======
       

 

 

-
+
         Example
       

->>>>>>> .merge-right.r57125
 
cons<int, cons<float> > l(12, cons<float>(5.5f));
-std::cout << at_c<0>(l) << std::endl;
-std::cout << at_c<1>(l) << std::endl;
+std::cout << at_c<0>(l) << std::endl;
+std::cout << at_c<1>(l) << std::endl;
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion.html b/doc/html/fusion/container/conversion.html
index 08bd23aa..1c61f4f6 100644
--- a/doc/html/fusion/container/conversion.html
+++ b/doc/html/fusion/container/conversion.html
@@ -1,16 +1,12 @@
 
 
-
+
 Conversion
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,38 +22,28 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
Functions

 
Metafunctions

 

 

-        All fusion sequences can be converted to one of the Container
+        All fusion sequences can be converted to one of the Container
         types using one of these conversion functions.
       

-<<<<<<< .working
-

-
-        Header
-      

-=======
 

-
+
         Header
       

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/include/convert.hpp>
 

 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/functions.html b/doc/html/fusion/container/conversion/functions.html
index 5afe4a54..cba92405 100644
--- a/doc/html/fusion/container/conversion/functions.html
+++ b/doc/html/fusion/container/conversion/functions.html
@@ -1,16 +1,12 @@
 
 
-
+
 Functions
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
as_list

 
as_vector

@@ -42,7 +35,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/functions/as_list.html b/doc/html/fusion/container/conversion/functions/as_list.html
index ed08df99..1235bdef 100644
--- a/doc/html/fusion/container/conversion/functions/as_list.html
+++ b/doc/html/fusion/container/conversion/functions/as_list.html
@@ -3,18 +3,10 @@
 
 as_list
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Convert a fusion sequence to a list.
+            Convert a fusion sequence to a list.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_list<Sequence>::type
@@ -107,33 +46,8 @@
 as_list(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 
@@ -142,129 +56,66 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    seq
-                  

+

+                  

+                    seq
+                  

+                  		
+                  

                     An instance of Sequence
-                  

+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
as_list(seq);
 

 

-            Return type: result_of::as_list<Sequence>::type
+            Return type: result_of::as_list<Sequence>::type
           

 

-            Semantics: Convert a fusion sequence,
-            seq, to a list.
+            Semantics: Convert a fusion sequence,
+            seq, to a list.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/include/as_list.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
as_list(make_vector('x', 123, "hello"))
+
as_list(make_vector('x', 123, "hello"))
 

 

 
diff --git a/doc/html/fusion/container/conversion/functions/as_map.html b/doc/html/fusion/container/conversion/functions/as_map.html
index 0dc1f7d1..37e5379b 100644
--- a/doc/html/fusion/container/conversion/functions/as_map.html
+++ b/doc/html/fusion/container/conversion/functions/as_map.html
@@ -3,18 +3,10 @@
 as_map
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-as_map
-

-

-

+

+

+as_map
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Convert a fusion sequence to a map.
+            Convert a fusion sequence to a map.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_map<Sequence>::type
@@ -107,33 +46,8 @@
 as_map(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -142,136 +56,73 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    seq
-                  

+

+                  

+                    seq
+                  

+                  		
+                  

                     An instance of Sequence
-                  

+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
as_map(seq);
 

 

-            Return type: result_of::as_map<Sequence>::type
+            Return type: result_of::as_map<Sequence>::type
           

 

-            Semantics: Convert a fusion sequence,
-            seq, to a map.
+            Semantics: Convert a fusion sequence,
+            seq, to a map.
           

 

-            Precondition: The elements of the sequence
+            Precondition: The elements of the sequence
             are assumed to be __fusionpair_s.
-            There may be no duplicate fusion::pair key types.
+            There may be no duplicate fusion::pair key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/map/convert.hpp>
 #include <boost/fusion/include/as_map.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
as_map(make_vector(
-    make_pair<int>('X')
-  , make_pair<double>("Men")))
+
as_map(make_vector(
+    make_pair<int>('X')
+  , make_pair<double>("Men")))
 

 

 
diff --git a/doc/html/fusion/container/conversion/functions/as_set.html b/doc/html/fusion/container/conversion/functions/as_set.html
index f61353dd..af695532 100644
--- a/doc/html/fusion/container/conversion/functions/as_set.html
+++ b/doc/html/fusion/container/conversion/functions/as_set.html
@@ -3,18 +3,10 @@
 as_set
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-

-as_set
-

-

-

+

+

+as_set
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Convert a fusion sequence to a set.
+            Convert a fusion sequence to a set.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_set<Sequence>::type
@@ -107,33 +46,8 @@
 as_set(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -142,133 +56,70 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    seq
-                  

+

+                  

+                    seq
+                  

+                  		
+                  

                     An instance of Sequence
-                  

+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
as_set(seq);
 

 

-            Return type: result_of::as_set<Sequence>::type
+            Return type: result_of::as_set<Sequence>::type
           

 

-            Semantics: Convert a fusion sequence,
-            seq, to a set.
+            Semantics: Convert a fusion sequence,
+            seq, to a set.
           

 

-            Precondition: There may be no duplicate
+            Precondition: There may be no duplicate
             key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/set/convert.hpp>
 #include <boost/fusion/include/as_set.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
as_set(make_vector('x', 123, "hello"))
+
as_set(make_vector('x', 123, "hello"))
 

 
 
diff --git a/doc/html/fusion/container/conversion/functions/as_vector.html b/doc/html/fusion/container/conversion/functions/as_vector.html
index 5e8b4337..883bf503 100644
--- a/doc/html/fusion/container/conversion/functions/as_vector.html
+++ b/doc/html/fusion/container/conversion/functions/as_vector.html
@@ -3,18 +3,10 @@
 as_vector
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,73 +22,20 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Convert a fusion sequence to a vector.
+            Convert a fusion sequence to a vector.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 typename result_of::as_vector<Sequence>::type
@@ -107,33 +46,8 @@
 as_vector(Sequence const& seq);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -142,129 +56,66 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    seq
-                  

+

+                  

+                    seq
+                  

+                  		
+                  

                     An instance of Sequence
-                  

+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
as_vector(seq);
 

 

-            Return type: result_of::as_vector<Sequence>::type
+            Return type: result_of::as_vector<Sequence>::type
           

 

-            Semantics: Convert a fusion sequence,
-            seq, to a vector.
+            Semantics: Convert a fusion sequence,
+            seq, to a vector.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/include/as_vector.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
as_vector(make_list('x', 123, "hello"))
+
as_vector(make_list('x', 123, "hello"))
 

 
 
diff --git a/doc/html/fusion/container/conversion/metafunctions.html b/doc/html/fusion/container/conversion/metafunctions.html
index b84fca8b..bdfbebe3 100644
--- a/doc/html/fusion/container/conversion/metafunctions.html
+++ b/doc/html/fusion/container/conversion/metafunctions.html
@@ -1,16 +1,12 @@
 
-
+Metafunctions
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
-
+
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
as_list

 
as_vector

@@ -42,7 +35,7 @@
 

 

 
 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_list.html b/doc/html/fusion/container/conversion/metafunctions/as_list.html
index 49e1d2e5..410e455b 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_list.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_list.html
@@ -3,18 +3,10 @@
 
 as_list
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,105 +22,27 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of as_list.
+            Returns the result type of as_list.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_list;
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 
@@ -137,130 +51,67 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    Sequence
-                  

-                    A fusion Sequence
-                  

+

+                  

+                    Sequence
+                  

+                  		
+                  

+                    A fusion Sequence
+                  

+                  		
+                  

                     The sequence type to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_list<Sequence>::type;
 

 

-            Return type: A list with same elements as the
-            input sequence, Sequence.
+            Return type: A list with same elements as the
+            input sequence, Sequence.
           

 

-            Semantics: Convert a fusion sequence,
-            Sequence, to a list.
+            Semantics: Convert a fusion sequence,
+            Sequence, to a list.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/include/as_list.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
result_of::as_list<vector<char, int> >::type
+
result_of::as_list<vector<char, int> >::type
 

 

 
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_map.html b/doc/html/fusion/container/conversion/metafunctions/as_map.html
index c970c492..de9412aa 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_map.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_map.html
@@ -3,18 +3,10 @@
 as_map
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,105 +22,27 @@
 

 PrevUpHomeNext
 

-

-

-

-as_map
-

-

-

+

+

+as_map
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of as_map.
+            Returns the result type of as_map.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_map;
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -137,137 +51,74 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    Sequence
-                  

-                    A fusion Sequence
-                  

+

+                  

+                    Sequence
+                  

+                  		
+                  

+                    A fusion Sequence
+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_map<Sequence>::type;
 

 

-            Return type: A map with same elements as the
-            input sequence, Sequence.
+            Return type: A map with same elements as the
+            input sequence, Sequence.
           

 

-            Semantics: Convert a fusion sequence,
-            Sequence, to a map.
+            Semantics: Convert a fusion sequence,
+            Sequence, to a map.
           

 

-            Precondition: The elements of the sequence
+            Precondition: The elements of the sequence
             are assumed to be __fusionpair_s.
-            There may be no duplicate fusion::pair key types.
+            There may be no duplicate fusion::pair key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/map/convert.hpp>
 #include <boost/fusion/include/as_map.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
result_of::as_map<vector<
-    fusion::pair<int, char>
-  , fusion::pair<double, std::string> > >::type
+
result_of::as_map<vector<
+    fusion::pair<int, char>
+  , fusion::pair<double, std::string> > >::type
 

 

 
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_set.html b/doc/html/fusion/container/conversion/metafunctions/as_set.html
index feb69a36..1a3bf64f 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_set.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_set.html
@@ -3,18 +3,10 @@
 as_set
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,105 +22,27 @@
 

 PrevUpHomeNext
 

-

-

-

-as_set
-

-

-

+

+

+as_set
+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of as_set.
+            Returns the result type of as_set.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_set;
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -137,134 +51,71 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    Sequence
-                  

-                    A fusion Sequence
-                  

+

+                  

+                    Sequence
+                  

+                  		
+                  

+                    A fusion Sequence
+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_set<Sequence>::type;
 

 

-            Return type: A set with same elements as the
-            input sequence, Sequence.
+            Return type: A set with same elements as the
+            input sequence, Sequence.
           

 

-            Semantics: Convert a fusion sequence,
-            Sequence, to a set.
+            Semantics: Convert a fusion sequence,
+            Sequence, to a set.
           

 

-            Precondition: There may be no duplicate
+            Precondition: There may be no duplicate
             key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/set/convert.hpp>
 #include <boost/fusion/include/as_set.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
result_of::as_set<vector<char, int> >::type
+
result_of::as_set<vector<char, int> >::type
 

 
 
diff --git a/doc/html/fusion/container/conversion/metafunctions/as_vector.html b/doc/html/fusion/container/conversion/metafunctions/as_vector.html
index a8f74e32..70a4a127 100644
--- a/doc/html/fusion/container/conversion/metafunctions/as_vector.html
+++ b/doc/html/fusion/container/conversion/metafunctions/as_vector.html
@@ -3,18 +3,10 @@
 as_vector
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,105 +22,27 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Returns the result type of as_vector.
+            Returns the result type of as_vector.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Sequence>
 struct as_vector;
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -137,130 +51,67 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    Sequence
-                  

-                    A fusion Sequence
-                  

+

+                  

+                    Sequence
+                  

+                  		
+                  

+                    A fusion Sequence
+                  

+                  		
+                  

                     The sequence to convert.
-                  

 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
result_of::as_vector<Sequence>::type;
 

 

-            Return type: A vector with same elements as
-            the input sequence, Sequence.
+            Return type: A vector with same elements as
+            the input sequence, Sequence.
           

 

-            Semantics: Convert a fusion sequence,
-            Sequence, to a vector.
+            Semantics: Convert a fusion sequence,
+            Sequence, to a vector.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/include/as_vector.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

-
result_of::as_vector<list<char, int> >::type
+
result_of::as_vector<list<char, int> >::type
 

 
 
diff --git a/doc/html/fusion/container/generation.html b/doc/html/fusion/container/generation.html
index f25ad9a0..f9999511 100644
--- a/doc/html/fusion/container/generation.html
+++ b/doc/html/fusion/container/generation.html
@@ -1,16 +1,12 @@
 
-
+Generation
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
-
+
@@ -26,38 +22,28 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
Functions

 
MetaFunctions

 

 

-        These are the functions that you can use to generate various forms of Container from elemental values.
+        These are the functions that you can use to generate various forms of Container from elemental values.
       

-<<<<<<< .working
-

-
-        Header
-      

-=======
 

-
+
         Header
       

->>>>>>> .merge-right.r57125
 
#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/include/generation.hpp>
 

 

 

 
 
 
 
 
 
 

-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions.html b/doc/html/fusion/container/generation/functions.html
index 6ad5185d..2c1861cc 100644
--- a/doc/html/fusion/container/generation/functions.html
+++ b/doc/html/fusion/container/generation/functions.html
@@ -1,16 +1,12 @@
 
 
-
+
 Functions
 
-<<<<<<< .working
-
-=======
 
->>>>>>> .merge-right.r57125
-
+
 
-
+
 
 
 
@@ -26,13 +22,10 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

 
make_list

 
make_cons

@@ -47,7 +40,7 @@
 

 
-

 
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
+
Copyright © 2001-2007 Joel de Guzman, Dan Marsden, Tobias
       Schwinger

         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)
diff --git a/doc/html/fusion/container/generation/functions/list_tie.html b/doc/html/fusion/container/generation/functions/list_tie.html
index cb6fe5f3..33a824d3 100644
--- a/doc/html/fusion/container/generation/functions/list_tie.html
+++ b/doc/html/fusion/container/generation/functions/list_tie.html
@@ -3,18 +3,10 @@
 
 list_tie
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,116 +22,38 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Constructs a tie using a list sequence.
+            Constructs a tie using a list sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
-list<T0&, T1&,... TN&>
+list<T0&, T1&,... TN&>
 list_tie(T0& x0, T1& x1... TN& xN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_LIST_SIZE
-            elements, where FUSION_MAX_LIST_SIZE
-            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
-            FUSION_MAX_LIST_SIZE
+            The variadic function accepts 0
+            to FUSION_MAX_LIST_SIZE
+            elements, where FUSION_MAX_LIST_SIZE
+            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
+            FUSION_MAX_LIST_SIZE
             before including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_LIST_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 
@@ -148,129 +62,66 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to list_tie
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to list_tie
+                  

+                  		
 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
list_tie(x0, x1,... xN);
 

 

-            Return type: list<T0&, T1&,...
+            Return type: list<T0&, T1&,...
             TN&>
           

 

-            Semantics: Create a list of references from x0, x1,... xN.
+            Semantics: Create a list of references from x0, x1,... xN.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/list_tie.hpp>
 #include <boost/fusion/include/list_tie.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
int i = 123;
 double d = 123.456;
diff --git a/doc/html/fusion/container/generation/functions/make_cons.html b/doc/html/fusion/container/generation/functions/make_cons.html
index 64e72ad2..eff0b797 100644
--- a/doc/html/fusion/container/generation/functions/make_cons.html
+++ b/doc/html/fusion/container/generation/functions/make_cons.html
@@ -3,18 +3,10 @@
 
 make_cons
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,112 +22,34 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Create a cons
-            from car (head)
-            and optional cdr (tail).
+            Create a cons
+            from car (head)
+            and optional cdr (tail).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename Car>
-typename result_of::make_cons<Car>::type
+typename result_of::make_cons<Car>::type
 make_cons(Car const& car);
 
 template <typename Car, typename Cdr>
-typename result_of::make_cons<Car, Cdr>::type
+typename result_of::make_cons<Car, Cdr>::type
 make_cons(Car const& car, Cdr const& cdr);
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 
@@ -144,176 +58,94 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+
+
+                  

+                  
-
-
-
+
+
+                  

+                  

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 
 

-                    car
-                  

-                    Instance of Car
-                  

+

+                  

+                    car
+                  

+                  		
+                  

+                    Instance of Car
+                  

+                  		
+                  

                     The list's head
-                  

 

 

-                    cdr
-                  

-                    Instance of Cdr
-                  

+

+                  

+                    cdr
+                  

+                  		
+                  

+                    Instance of Cdr
+                  

+                  		
+                  

                     The list's tail (optional)
-                  

 

 
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
make_cons(car, cdr);
 

 

-            Return type: result_of::make_cons<Car, Cdr>::type or result_of::make_cons<Car>::type
+            Return type: result_of::make_cons<Car, Cdr>::type or result_of::make_cons<Car>::type
           

 

-            Semantics: Create a cons from car
-            (head) and optional cdr
+            Semantics: Create a cons from car
+            (head) and optional cdr
             (tail).
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_cons.hpp>
 #include <boost/fusion/include/make_cons.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
make_cons('x', make_cons(123))
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            See
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             See
->>>>>>> .merge-right.r57125
             also
           

 

-            boost::ref
+            boost::ref
           

 

 
diff --git a/doc/html/fusion/container/generation/functions/make_list.html b/doc/html/fusion/container/generation/functions/make_list.html
index 47c6877a..8f5d19bd 100644
--- a/doc/html/fusion/container/generation/functions/make_list.html
+++ b/doc/html/fusion/container/generation/functions/make_list.html
@@ -3,18 +3,10 @@
 make_list
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,117 +22,39 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Create a list
+            Create a list
             from one or more values.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
-typename result_of::make_list<T0, T1,... TN>::type
+typename result_of::make_list<T0, T1,... TN>::type
 make_list(T0 const& x0, T1 const& x1... TN const& xN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_LIST_SIZE
-            elements, where FUSION_MAX_LIST_SIZE
-            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
-            FUSION_MAX_LIST_SIZE
+            The variadic function accepts 0
+            to FUSION_MAX_LIST_SIZE
+            elements, where FUSION_MAX_LIST_SIZE
+            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
+            FUSION_MAX_LIST_SIZE
             before including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_LIST_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -149,163 +63,75 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to make_list
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to make_list
+                  

+                  		
 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
make_list(x0, x1,... xN);
 

 

-            Return type: result_of::make_list<T0, T1,... TN>::type
+            Return type: result_of::make_list<T0, T1,... TN>::type
           

 

-            Semantics: Create a list from x0, x1,... xN.
+            Semantics: Create a list from x0, x1,... xN.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_list.hpp>
 #include <boost/fusion/include/make_list.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
make_list(123, "hello", 12.5)
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            See
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             See
->>>>>>> .merge-right.r57125
             also
           

 

-            boost::ref
+            boost::ref
           

 

 
diff --git a/doc/html/fusion/container/generation/functions/make_map.html b/doc/html/fusion/container/generation/functions/make_map.html
index 1ba0fb21..f2781816 100644
--- a/doc/html/fusion/container/generation/functions/make_map.html
+++ b/doc/html/fusion/container/generation/functions/make_map.html
@@ -3,18 +3,10 @@
 make_map
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,119 +22,41 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Create a map
+            Create a map
             from one or more key/data pairs.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <
     typename K0, typename K1,... typename KN
   , typename T0, typename T1,... typename TN>
-typename result_of::make_map<K0, K0,... KN, T0, T1,... TN>::type
+typename result_of::make_map<K0, K0,... KN, T0, T1,... TN>::type
 make_map(T0 const& x0, T1 const& x1... TN const& xN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_MAP_SIZE
-            elements, where FUSION_MAX_MAP_SIZE
-            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
-            FUSION_MAX_MAP_SIZE before
+            The variadic function accepts 0
+            to FUSION_MAX_MAP_SIZE
+            elements, where FUSION_MAX_MAP_SIZE
+            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
+            FUSION_MAX_MAP_SIZE before
             including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_MAP_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -151,186 +65,104 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+                  

+                  
+
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 
 

-                    K0,
+

+                  

+                    K0,
                     K1,...
-                    KN
-                  

+                    KN
+                  

+                  		
+                  

                     The key types
-                  

-                    Keys associated with x0, x1,... xN
-                  

+                  

+                    Keys associated with x0, x1,... xN
+                  

+                  		
 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to make_map
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to make_map
+                  

+                  		
 

 
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
make_map<K0, K1,... KN>(x0, x1,... xN);
 

 

-            Return type: result_of::make_map<K0, K0,... KN, T0, T1,... TN>::type
+            Return type: result_of::make_map<K0, K0,... KN, T0, T1,... TN>::type
           

 

-            Semantics: Create a map from K0, K1,... KN
-            keys and x0,
+            Semantics: Create a map from K0, K1,... KN
+            keys and x0,
             x1,...
-            xN data.
+            xN data.
           

 

-            Precondition: There may be no duplicate
+            Precondition: There may be no duplicate
             key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/include/make_map.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
make_map<int, double>('X', "Men")
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            See
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             See
->>>>>>> .merge-right.r57125
             also
           

 

-            boost::ref,
-            fusion::pair
+            boost::ref,
+            fusion::pair
           

 

 
diff --git a/doc/html/fusion/container/generation/functions/make_set.html b/doc/html/fusion/container/generation/functions/make_set.html
index ed55751d..d96886eb 100644
--- a/doc/html/fusion/container/generation/functions/make_set.html
+++ b/doc/html/fusion/container/generation/functions/make_set.html
@@ -3,18 +3,10 @@
 make_set
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,117 +22,39 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Create a set
+            Create a set
             from one or more values.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
-typename result_of::make_set<T0, T1,... TN>::type
+typename result_of::make_set<T0, T1,... TN>::type
 make_set(T0 const& x0, T1 const& x1... TN const& xN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_SET_SIZE
-            elements, where FUSION_MAX_SET_SIZE
-            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
-            FUSION_MAX_SET_SIZE before
+            The variadic function accepts 0
+            to FUSION_MAX_SET_SIZE
+            elements, where FUSION_MAX_SET_SIZE
+            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
+            FUSION_MAX_SET_SIZE before
             including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_SET_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -149,167 +63,79 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to make_set
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to make_set
+                  

+                  		
 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
make_set(x0, x1,... xN);
 

 

-            Return type: result_of::make_set<T0, T1,... TN>::type
+            Return type: result_of::make_set<T0, T1,... TN>::type
           

 

-            Semantics: Create a set from x0, x1,... xN.
+            Semantics: Create a set from x0, x1,... xN.
           

 

-            Precondition: There may be no duplicate
+            Precondition: There may be no duplicate
             key types.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_set.hpp>
 #include <boost/fusion/include/make_set.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
make_set(123, "hello", 12.5)
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            See
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             See
->>>>>>> .merge-right.r57125
             also
           

 

-            boost::ref
+            boost::ref
           

 
 
diff --git a/doc/html/fusion/container/generation/functions/make_vector.html b/doc/html/fusion/container/generation/functions/make_vector.html
index 21107ae1..f602297f 100644
--- a/doc/html/fusion/container/generation/functions/make_vector.html
+++ b/doc/html/fusion/container/generation/functions/make_vector.html
@@ -3,18 +3,10 @@
 make_vector
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,117 +22,39 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Create a vector
+            Create a vector
             from one or more values.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename T0, typename T1,... typename TN>
-typename result_of::make_vector<T0, T1,... TN>::type
+typename result_of::make_vector<T0, T1,... TN>::type
 make_vector(T0 const& x0, T1 const& x1... TN const& xN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_VECTOR_SIZE
-            elements, where FUSION_MAX_VECTOR_SIZE
-            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
-            FUSION_MAX_VECTOR_SIZE
+            The variadic function accepts 0
+            to FUSION_MAX_VECTOR_SIZE
+            elements, where FUSION_MAX_VECTOR_SIZE
+            is a user definable predefined maximum that defaults to 10. You may define the preprocessor constant
+            FUSION_MAX_VECTOR_SIZE
             before including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_VECTOR_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -149,163 +63,75 @@
 
-
-
+
-
+
+                  

+                  
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to make_vector
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to make_vector
+                  

+                  		
 

 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
make_vector(x0, x1,... xN);
 

 

-            Return type: result_of::make_vector<T0, T1,... TN>::type
+            Return type: result_of::make_vector<T0, T1,... TN>::type
           

 

-            Semantics: Create a vector from x0, x1,... xN.
+            Semantics: Create a vector from x0, x1,... xN.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/include/make_vector.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
make_vector(123, "hello", 12.5)
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            See
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             See
->>>>>>> .merge-right.r57125
             also
           

 

-            boost::ref
+            boost::ref
           

 
 
diff --git a/doc/html/fusion/container/generation/functions/map_tie.html b/doc/html/fusion/container/generation/functions/map_tie.html
index 4be441af..6cbdb8ab 100644
--- a/doc/html/fusion/container/generation/functions/map_tie.html
+++ b/doc/html/fusion/container/generation/functions/map_tie.html
@@ -3,18 +3,10 @@
 map_tie
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
@@ -30,116 +22,38 @@
 

 PrevUpHomeNext
 

-

-

-
-

-

+

+

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Description
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Description
->>>>>>> .merge-right.r57125
           

 

-            Constructs a tie using a map sequence.
+            Constructs a tie using a map sequence.
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Synopsis
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Synopsis
->>>>>>> .merge-right.r57125
           

 
template <typename K0, typename K1,... typename KN, typename D0, typename D1,... typename DN>
-map<pair<K0, D0&>, pair<K1, D1&>,... pair<KN, DN&> >
+map<pair<K0, D0&>, pair<K1, D1&>,... pair<KN, DN&> >
 map_tie(D0& d0, D1& d1... DN& dN);
 

 

-            The variadic function accepts 0
-            to FUSION_MAX_MAP_SIZE
-            elements, where FUSION_MAX_MAP_SIZE
-            is a user definable predefined maximum that defaults to 10, and a corresponding number of key types.
-            You may define the preprocessor constant FUSION_MAX_MAP_SIZE
+            The variadic function accepts 0
+            to FUSION_MAX_MAP_SIZE
+            elements, where FUSION_MAX_MAP_SIZE
+            is a user definable predefined maximum that defaults to 10, and a corresponding number of key types.
+            You may define the preprocessor constant FUSION_MAX_MAP_SIZE
             before including any Fusion header to change the default. Example:
           

 
#define FUSION_MAX_MAP_SIZE 20
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Parameters
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Parameters
->>>>>>> .merge-right.r57125
           

 

 
 
 
 
 
@@ -148,146 +62,89 @@
 
-
-
+
-
+
+                  

+                  
-
-
+
-
+
+                  

+                  
-
-
-
+                    xN
+                  

+                  
+
+

 

 
 

+

+                  

                     Parameter
-                  

+                  

+                  		
+                  

                     Requirement
-                  

+                  

+                  		
+                  

                     Description
-                  

 

 
 

-                    K0,
+

+                  

+                    K0,
                     K1,...
-                    KN
-                  

+                    KN
+                  

+                  		
+                  

                     Any type
-                  

-                    The key types associated with each of the x1,x2,...,xN
+                  

+                  		
+                  

+                    The key types associated with each of the x1,x2,...,xN
                     values
-                  

 

 

-                    x0,
+

+                  

+                    x0,
                     x1,...
-                    xN
-                  

-                    Instances of T0, T1,... TN
-                  

-                    The arguments to map_tie
-                  

+                  

+                    Instances of T0, T1,... TN
+                  

+                  		
+                  

+                    The arguments to map_tie
+                  

+                  		
 

 
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Expression
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Expression
->>>>>>> .merge-right.r57125
             Semantics
           

 
map_tie<K0, K1,... KN>(x0, x1,... xN);
 

 

-            Return type: map<pair<K0, D0&>, pair<K1,
-            D1&>,... pair<KN,
+            Return type: map<pair<K0, D0&>, pair<K1,
+            D1&>,... pair<KN,
             DN&> >
           

 

-            Semantics: Create a map of references from x0, x1,... xN with keys K0, K1,... KN
+            Semantics: Create a map of references from x0, x1,... xN with keys K0, K1,... KN
           

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Header
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Header
->>>>>>> .merge-right.r57125
           

 
#include <boost/fusion/container/generation/map_tie.hpp>
 #include <boost/fusion/include/map_tie.hpp>
 

 

-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-<<<<<<< .working
-
-            Example
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
-=======
-
->>>>>>> .merge-right.r58559
->>>>>>> .merge-right.r58549
->>>>>>> .merge-right.r58299
->>>>>>> .merge-right.r57337
->>>>>>> .merge-right.r57242
+
             Example
->>>>>>> .merge-right.r57125
           

 
struct int_key;
 struct double_key;
diff --git a/doc/html/fusion/container/generation/functions/tiers.html b/doc/html/fusion/container/generation/functions/tiers.html
index ca7f80bf..4d76ec45 100644
--- a/doc/html/fusion/container/generation/functions/tiers.html
+++ b/doc/html/fusion/container/generation/functions/tiers.html
@@ -3,18 +3,10 @@
 
 Tiers
 
-<<<<<<< .working
-
-=======
 
-<<<<<<< .working
->>>>>>> .merge-right.r57125
-
-=======
 
->>>>>>> .merge-right.r58299
 
-
+
 
 
 
@@ -30,45 +22,34 @@
 

 PrevUpHomeNext
 

-

-

-

-Tiers
-

-

-

+

+

+Tiers
+

 

             Tiers are sequences, where all elements are non-const reference types.
             They are constructed with a call to a couple of tie
             function templates. The succeeding sections document the various tier
             flavors.
           

-