diff options
author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/detail/allocator_utilities.hpp | |
parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'boost/detail/allocator_utilities.hpp')
-rw-r--r-- | boost/detail/allocator_utilities.hpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/boost/detail/allocator_utilities.hpp b/boost/detail/allocator_utilities.hpp index 5d6ef48b05..ed3de8466d 100644 --- a/boost/detail/allocator_utilities.hpp +++ b/boost/detail/allocator_utilities.hpp @@ -1,4 +1,4 @@ -/* Copyright 2003-2009 Joaquin M Lopez Munoz. +/* Copyright 2003-2013 Joaquin M Lopez Munoz. * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) @@ -11,7 +11,6 @@ #include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */ #include <boost/detail/workaround.hpp> -#include <boost/mpl/aux_/msvc_never_true.hpp> #include <boost/mpl/eval_if.hpp> #include <boost/type_traits/is_same.hpp> #include <cstddef> @@ -116,29 +115,6 @@ struct partial_std_allocator_rebind_to /* rebind operation in all other cases */ -#if BOOST_WORKAROUND(BOOST_MSVC,<1300) -/* Workaround for a problem in MSVC with dependent template typedefs - * when doing rebinding of allocators. - * Modeled after <boost/mpl/aux_/msvc_dtw.hpp> (thanks, Aleksey!) - */ - -template<typename Allocator> -struct rebinder -{ - template<bool> struct fake_allocator:Allocator{}; - template<> struct fake_allocator<true> - { - template<typename Type> struct rebind{}; - }; - - template<typename Type> - struct result: - fake_allocator<mpl::aux::msvc_never_true<Allocator>::value>:: - template rebind<Type> - { - }; -}; -#else template<typename Allocator> struct rebinder { @@ -149,7 +125,6 @@ struct rebinder rebind<Type>::other other; }; }; -#endif template<typename Allocator,typename Type> struct compliant_allocator_rebind_to |