Boost logo

Boost-Commit :

From: jefffaust_at_[hidden]
Date: 2007-05-28 14:10:40


Author: jefffaust
Date: 2007-05-28 14:10:40 EDT (Mon, 28 May 2007)
New Revision: 4332
URL: http://svn.boost.org/trac/boost/changeset/4332

Log:
Use namespaces explicitly to avoid issues with mpl::size_t vs. std::size_t

Text files modified:
   sandbox/explore/boost/explore/is_assoc_iter.hpp | 14 ++++++--------
   1 files changed, 6 insertions(+), 8 deletions(-)

Modified: sandbox/explore/boost/explore/is_assoc_iter.hpp
==============================================================================
--- sandbox/explore/boost/explore/is_assoc_iter.hpp (original)
+++ sandbox/explore/boost/explore/is_assoc_iter.hpp 2007-05-28 14:10:40 EDT (Mon, 28 May 2007)
@@ -16,8 +16,6 @@
 {
     namespace detail
     {
- using namespace boost::mpl;
-
         struct false_type
         {
             char member[100];
@@ -35,7 +33,7 @@
         T& make_t();
 
         template< typename T>
- struct has_value_type : bool_<
+ struct has_value_type : boost::mpl::bool_<
             sizeof(false_type)
             !=
             sizeof(has_value_func(make_t<T>()))>
@@ -46,10 +44,10 @@
         // of a map of which the iterator matches iterator_t
         //
         template<typename T>
- struct is_pair : false_ {};
+ struct is_pair : boost::mpl::false_ {};
 
         template<typename T1, typename T2>
- struct is_pair<std::pair<T1, T2> > : true_ {};
+ struct is_pair<std::pair<T1, T2> > : boost::mpl::true_ {};
 
         template<typename T>
         struct value_type_is_pair : is_pair<typename T::value_type> {};
@@ -58,9 +56,9 @@
     // an associative iterator has a value type of pair<>
     template <typename T>
     struct is_assoc_iter :
- eval_if<
+ boost::mpl::eval_if<
             detail::has_value_type<T>,
             detail::value_type_is_pair<T>,
- false_
+ boost::mpl::false_
> {};
-}
\ No newline at end of file
+}


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk