boostorg/detail
1
0
Fork 1
mirror of https://github.com/boostorg/detail.git synced 2025-08-03 14:24:26 +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 badda17c31
commit b2deb5ac68
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/detail/allocator_utilities.hpp
View File

@@ -12,7 +12,7 @@
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */ #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/mpl/aux_/msvc_never_true.hpp> #include <boost/mpl/aux_/msvc_never_true.hpp>
#include <boost/mpl/apply_if.hpp> #include <boost/mpl/eval_if.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
@@ -147,7 +147,7 @@ struct compliant_allocator_rebind_to
template<typename Allocator,typename Type> template<typename Allocator,typename Type>
struct rebind_to: struct rebind_to:
mpl::apply_if_c< mpl::eval_if_c<
is_partial_std_allocator<Allocator>::value, is_partial_std_allocator<Allocator>::value,
partial_std_allocator_rebind_to<Allocator,Type>, partial_std_allocator_rebind_to<Allocator,Type>,
compliant_allocator_rebind_to<Allocator,Type> compliant_allocator_rebind_to<Allocator,Type>

2
include/boost/detail/iterator.hpp
View File

@@ -144,7 +144,7 @@ struct iterator_traits<T const*>
# endif # endif
# include <boost/mpl/if.hpp> # include <boost/mpl/if.hpp>
# include <boost/mpl/aux_/has_xxx.hpp> # include <boost/mpl/has_xxx.hpp>
# include <cstddef> # include <cstddef>
// should be the last #include // should be the last #include

4
include/boost/indirect_reference.hpp
View File

@@ -10,7 +10,7 @@
# include <boost/detail/is_incrementable.hpp> # include <boost/detail/is_incrementable.hpp>
# include <boost/iterator/iterator_traits.hpp> # include <boost/iterator/iterator_traits.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/pointee.hpp> # include <boost/pointee.hpp>
namespace boost { namespace boost {
@@ -26,7 +26,7 @@ namespace detail
template <class P> template <class P>
struct indirect_reference struct indirect_reference
: mpl::apply_if< : mpl::eval_if<
detail::is_incrementable<P> detail::is_incrementable<P>
, iterator_reference<P> , iterator_reference<P>
, detail::smart_ptr_reference<P> , detail::smart_ptr_reference<P>