diff options
Diffstat (limited to 'boost/container/detail/type_traits.hpp')
| -rw-r--r-- | boost/container/detail/type_traits.hpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/boost/container/detail/type_traits.hpp b/boost/container/detail/type_traits.hpp index 6a0b3ed58d..0e096e54e3 100644 --- a/boost/container/detail/type_traits.hpp +++ b/boost/container/detail/type_traits.hpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////// // (C) Copyright John Maddock 2000. -// (C) Copyright Ion Gaztanaga 2005-2011. +// (C) Copyright Ion Gaztanaga 2005-2012. // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -24,11 +24,18 @@ #include <boost/move/move.hpp> namespace boost { -namespace container { +namespace container { namespace container_detail { struct nat{}; +template <typename U> +struct LowPriorityConversion +{ + // Convertible from T with user-defined-conversion rank. + LowPriorityConversion(const U&) { } +}; + //boost::alignment_of yields to 10K lines of preprocessed code, so we //need an alternative template <typename T> struct alignment_of; @@ -195,7 +202,7 @@ struct remove_ref_const }; } // namespace container_detail -} //namespace container { +} //namespace container { } //namespace boost { #include <boost/container/detail/config_end.hpp> |