boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-01 23:11:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge new MPL version from 'mplbook' branch

Browse Source 
[SVN r24874]
This commit is contained in:
Aleksey Gurtovoy
2004-09-02 15:41:37 +00:00
parent 108365abe7
commit 56862b0bcc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/algorithm/string/collection_traits.hpp
View File

@ -25,7 +25,7 @@
#include <boost/algorithm/string/config.hpp> #include <boost/algorithm/string/config.hpp>
#include <boost/type_traits/is_array.hpp> #include <boost/type_traits/is_array.hpp>
#include <boost/type_traits/is_pointer.hpp> #include <boost/type_traits/is_pointer.hpp>
#include <boost/mpl/apply_if.hpp> #include <boost/mpl/eval_if.hpp>
// Implementation // Implementation
#include <boost/algorithm/string/detail/collection_traits.hpp> #include <boost/algorithm/string/detail/collection_traits.hpp>
@ -74,13 +74,13 @@ namespace boost {
struct collection_traits struct collection_traits
{ {
private: private:
typedef BOOST_STRING_TYPENAME ::boost::mpl::apply_if< typedef BOOST_STRING_TYPENAME ::boost::mpl::eval_if<
::boost::algorithm::detail::is_pair<T>, ::boost::algorithm::detail::is_pair<T>,
detail::pair_container_traits_selector<T>, detail::pair_container_traits_selector<T>,
BOOST_STRING_TYPENAME ::boost::mpl::apply_if< BOOST_STRING_TYPENAME ::boost::mpl::eval_if<
::boost::is_array<T>, ::boost::is_array<T>,
detail::array_container_traits_selector<T>, detail::array_container_traits_selector<T>,
BOOST_STRING_TYPENAME ::boost::mpl::apply_if< BOOST_STRING_TYPENAME ::boost::mpl::eval_if<
::boost::is_pointer<T>, ::boost::is_pointer<T>,
detail::pointer_container_traits_selector<T>, detail::pointer_container_traits_selector<T>,
detail::default_container_traits_selector<T> detail::default_container_traits_selector<T>

10
include/boost/algorithm/string/detail/collection_traits.hpp
View File

@ -19,7 +19,7 @@
#include <boost/type_traits/is_convertible.hpp> #include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/remove_pointer.hpp> #include <boost/type_traits/remove_pointer.hpp>
#include <boost/type_traits/remove_cv.hpp> #include <boost/type_traits/remove_cv.hpp>
#include <boost/mpl/apply_if.hpp> #include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp> #include <boost/mpl/identity.hpp>
#include <boost/mpl/vector.hpp> #include <boost/mpl/vector.hpp>
#include <boost/mpl/fold.hpp> #include <boost/mpl/fold.hpp>
@ -241,13 +241,13 @@ namespace boost {
struct array_traits_cv_selector struct array_traits_cv_selector
{ {
typedef BOOST_STRING_TYPENAME typedef BOOST_STRING_TYPENAME
::boost::mpl::apply_if< ::boost::mpl::eval_if<
::boost::is_convertible<T,BaseT*>, ::boost::is_convertible<T,BaseT*>,
array_traits_impl_selector<T,BaseT>, array_traits_impl_selector<T,BaseT>,
::boost::mpl::apply_if< ::boost::mpl::eval_if<
::boost::is_convertible<T,const BaseT*>, ::boost::is_convertible<T,const BaseT*>,
array_traits_impl_selector<T, const BaseT>, array_traits_impl_selector<T, const BaseT>,
::boost::mpl::apply_if< ::boost::mpl::eval_if<
::boost::is_convertible<T, volatile BaseT*>, ::boost::is_convertible<T, volatile BaseT*>,
array_traits_impl_selector<T, volatile BaseT>, array_traits_impl_selector<T, volatile BaseT>,
array_traits_impl_selector<T, const volatile BaseT> array_traits_impl_selector<T, const volatile BaseT>
@ -263,7 +263,7 @@ namespace boost {
struct apply struct apply
{ {
typedef BOOST_STRING_TYPENAME typedef BOOST_STRING_TYPENAME
::boost::mpl::apply_if< ::boost::mpl::eval_if<
::boost::is_convertible<T,const volatile T2*>, ::boost::is_convertible<T,const volatile T2*>,
array_traits_cv_selector<T,T2>, array_traits_cv_selector<T,T2>,
::boost::mpl::identity<T1> >::type type; ::boost::mpl::identity<T1> >::type type;