diff options
Diffstat (limited to 'libstdc++-v3/include/ext/array_allocator.h')
| -rw-r--r-- | libstdc++-v3/include/ext/array_allocator.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 47f52b5..736ae02 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -1,7 +1,6 @@ // array allocator -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -// Free Software Foundation, Inc. +// Copyright (C) 2004-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 @@ -35,6 +34,9 @@ #include <bits/functexcept.h> #include <tr1/array> #include <bits/move.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#include <type_traits> +#endif namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) { @@ -113,6 +115,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef _Tp value_type; typedef _Array array_type; +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2103. std::allocator propagate_on_container_move_assignment + typedef std::true_type propagate_on_container_move_assignment; +#endif + private: array_type* _M_array; size_type _M_used; |