Full merge from trunk at revision 41356 of entire boost-root tree.

[SVN r41369]
This commit is contained in:
Beman Dawes
2007-11-25 18:07:19 +00:00
parent d4b95734dd
commit 50b5726a6f
47 changed files with 532 additions and 421 deletions

View File

@ -1,11 +1,12 @@
// Boost string_algo library join.hpp header file ---------------------------//
// Copyright Pavol Droba 2002-2006. Use, modification and
// distribution is subject to 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)
// Copyright Pavol Droba 2002-2006.
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
// See http://www.boost.org for updates, documentation, and revision history.
// See http://www.boost.org/ for updates, documentation, and revision history.
#ifndef BOOST_STRING_JOIN_HPP
#define BOOST_STRING_JOIN_HPP
@ -13,7 +14,7 @@
#include <boost/algorithm/string/config.hpp>
#include <boost/algorithm/string/detail/sequence.hpp>
#include <boost/range/value_type.hpp>
#include <boost/range/as_literal.hpp>
/*! \file
Defines join algorithm.
@ -44,7 +45,7 @@ namespace boost {
inline typename range_value<SequenceSequenceT>::type
join(
const SequenceSequenceT& Input,
Range1T& Separator)
const Range1T& Separator)
{
// Define working types
typedef typename range_value<SequenceSequenceT>::type ResultT;
@ -67,7 +68,7 @@ namespace boost {
for(;itBegin!=itEnd; ++itBegin)
{
// Add separator
detail::insert(Result, end(Result), Separator);
detail::insert(Result, end(Result), as_literal(Separator));
// Add element
detail::insert(Result, end(Result), *itBegin);
}
@ -94,7 +95,7 @@ namespace boost {
inline typename range_value<SequenceSequenceT>::type
join_if(
const SequenceSequenceT& Input,
Range1T& Separator,
const Range1T& Separator,
PredicateT Pred)
{
// Define working types
@ -122,7 +123,7 @@ namespace boost {
if(Pred(*itBegin))
{
// Add separator
detail::insert(Result, end(Result), Separator);
detail::insert(Result, end(Result), as_literal(Separator));
// Add element
detail::insert(Result, end(Result), *itBegin);
}