diff options
Diffstat (limited to 'libstdc++-v3/include/bits/allocator.h')
-rw-r--r-- | libstdc++-v3/include/bits/allocator.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 0989ad8..5ccb491 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -1,7 +1,6 @@ // Allocators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -// 2011, 2012 Free Software Foundation, Inc. +// Copyright (C) 2001-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -46,6 +45,9 @@ // Define the base class to std::allocator. #include <bits/c++allocator.h> +#if __cplusplus >= 201103L +#include <type_traits> +#endif namespace std _GLIBCXX_VISIBILITY(default) { @@ -77,6 +79,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp1> struct rebind { typedef allocator<_Tp1> other; }; + +#if __cplusplus >= 201103L + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2103. std::allocator propagate_on_container_move_assignment + typedef true_type propagate_on_container_move_assignment; +#endif }; /** @@ -103,6 +111,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct rebind { typedef allocator<_Tp1> other; }; +#if __cplusplus >= 201103L + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2103. std::allocator propagate_on_container_move_assignment + typedef true_type propagate_on_container_move_assignment; +#endif + allocator() throw() { } allocator(const allocator& __a) throw() |