Update of /cvsroot/boost/boost/boost/algorithm/string
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17937
Modified Files:
case_conv.hpp trim.hpp
Log Message:
adapting to new range interface
Index: case_conv.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/case_conv.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- case_conv.hpp 1 Jul 2007 13:12:57 -0000 1.12
+++ case_conv.hpp 1 Jul 2007 13:29:56 -0000 1.13
@@ -74,7 +74,7 @@
const std::locale& Loc=std::locale())
{
return
::boost::algorithm::detail::transform_range_copy<SequenceT>(
- as_literal(Input),
+ Input,
::boost::algorithm::detail::to_lowerF<
typename range_value<SequenceT>::type
>(Loc));
}
@@ -139,7 +139,7 @@
const std::locale& Loc=std::locale())
{
return
::boost::algorithm::detail::transform_range_copy<SequenceT>(
- as_literal(Input),
+ Input,
::boost::algorithm::detail::to_upperF<
typename range_value<SequenceT>::type
>(Loc));
}
Index: trim.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/algorithm/string/trim.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- trim.hpp 27 Jul 2006 10:27:34 -0000 1.12
+++ trim.hpp 1 Jul 2007 13:29:56 -0000 1.13
@@ -16,6 +16,8 @@
#include <boost/range/begin.hpp>
#include <boost/range/end.hpp>
#include <boost/range/const_iterator.hpp>
+#include <boost/range/as_literal.hpp>
+#include <boost/range/iterator_range.hpp>
#include <boost/algorithm/string/detail/trim.hpp>
#include <boost/algorithm/string/classification.hpp>
@@ -61,12 +63,14 @@
const RangeT& Input,
PredicateT IsSpace)
{
+ iterator_range<BOOST_STRING_TYPENAME
range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+
std::copy(
::boost::algorithm::detail::trim_begin(
- begin(Input),
- end(Input),
+ begin(lit_range),
+ end(lit_range),
IsSpace ),
- end(Input),
+ end(lit_range),
Output);
return Output;
@@ -167,11 +171,13 @@
const RangeT& Input,
PredicateT IsSpace )
{
- std::copy(
- begin(Input),
+ iterator_range<BOOST_STRING_TYPENAME
range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+
+ std::copy(
+ begin(lit_range),
::boost::algorithm::detail::trim_end(
- begin(Input),
- end(Input),
+ begin(lit_range),
+ end(lit_range),
IsSpace ),
Output );
@@ -277,16 +283,18 @@
const RangeT& Input,
PredicateT IsSpace)
{
- BOOST_STRING_TYPENAME
+ iterator_range<BOOST_STRING_TYPENAME
range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+
+ BOOST_STRING_TYPENAME
range_const_iterator<RangeT>::type TrimEnd=
::boost::algorithm::detail::trim_end(
- begin(Input),
- end(Input),
+ begin(lit_range),
+ end(lit_range),
IsSpace);
std::copy(
detail::trim_begin(
- begin(Input), TrimEnd, IsSpace),
+ begin(lit_range), TrimEnd, IsSpace),
TrimEnd,
Output
);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
